HIVE-14671 : merge master into hive-14535 (Sergey Shelukhin)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e3fb1167 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e3fb1167 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e3fb1167 Branch: refs/heads/hive-14535 Commit: e3fb11671ff15215bc0d1ca6b054586e48fb8d32 Parents: 543e0b0 d2d9170 Author: sergey <ser...@apache.org> Authored: Fri Sep 15 20:38:51 2017 -0700 Committer: sergey <ser...@apache.org> Committed: Fri Sep 15 20:39:13 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hive/ql/Context.java | 18 +++++++++++++++++- .../ql/parse/UpdateDeleteSemanticAnalyzer.java | 20 ++++++++++---------- .../hive/ql/udf/generic/GenericUDFMaskHash.java | 2 +- .../org/apache/hive/service/CookieSigner.java | 2 +- 4 files changed, 29 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/e3fb1167/ql/src/java/org/apache/hadoop/hive/ql/Context.java ----------------------------------------------------------------------
