HIVE-11568 : merge master into branch (Sergey Shelukhin) ADDENDUM MERGE
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/2fe60861 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/2fe60861 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/2fe60861 Branch: refs/heads/master Commit: 2fe60861db72a4128448245f8031d1839e5e3f8e Parents: c528294 3071ce9 Author: Sergey Shelukhin <ser...@apache.org> Authored: Fri Aug 14 16:13:32 2015 -0700 Committer: Sergey Shelukhin <ser...@apache.org> Committed: Fri Aug 14 16:13:32 2015 -0700 ---------------------------------------------------------------------- .../hadoop/hive/ql/parse/DDLSemanticAnalyzer.java | 11 +++++++++++ .../clientnegative/alter_table_wrong_location.q | 4 ++++ .../clientnegative/alter_table_wrong_location.q.out | 9 +++++++++ .../apache/hive/spark/client/SparkClientImpl.java | 4 ++++ testutils/ptest2/pom.xml | 16 +--------------- testutils/ptest2/src/main/resources/log4j2.xml | 1 + 6 files changed, 30 insertions(+), 15 deletions(-) ----------------------------------------------------------------------
