Return-Path: 
 <commits-return-13406-apmail-ambari-commits-archive=ambari.apache.org@ambari.apache.org>
X-Original-To: apmail-ambari-commits-archive@www.apache.org
Delivered-To: apmail-ambari-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 881CD9932
	for <apmail-ambari-commits-archive@www.apache.org>;
 Tue, 16 Dec 2014 14:38:10 +0000 (UTC)
Received: (qmail 98400 invoked by uid 500); 16 Dec 2014 14:38:10 -0000
Delivered-To: apmail-ambari-commits-archive@ambari.apache.org
Received: (qmail 98371 invoked by uid 500); 16 Dec 2014 14:38:10 -0000
Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@ambari.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@ambari.apache.org>
List-Post: <mailto:commits@ambari.apache.org>
List-Id: <commits.ambari.apache.org>
Reply-To: ambari-dev@ambari.apache.org
Delivered-To: mailing list commits@ambari.apache.org
Received: (qmail 98362 invoked by uid 99); 16 Dec 2014 14:38:10 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Dec 2014 14:38:10 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 14853A2C68D; Tue, 16 Dec 2014 14:38:10 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aonishuk@apache.org
To: commits@ambari.apache.org
Message-Id: <38a2d1315d3947bea40cc601c346a79c@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: ambari git commit: AMBARI-8730. Configs: warnings using Hive client
 (aonishuk)
Date: Tue, 16 Dec 2014 14:38:10 +0000 (UTC)

Repository: ambari
Updated Branches:
  refs/heads/trunk bdf269570 -> 120681b83


AMBARI-8730. Configs: warnings using Hive client (aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/120681b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/120681b8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/120681b8

Branch: refs/heads/trunk
Commit: 120681b8314f2bc3d49c64b478ac36bf581d273d
Parents: bdf2695
Author: Andrew Onishuk <aonishuk@hortonworks.com>
Authored: Tue Dec 16 16:38:02 2014 +0200
Committer: Andrew Onishuk <aonishuk@hortonworks.com>
Committed: Tue Dec 16 16:38:02 2014 +0200

----------------------------------------------------------------------
 .../HDP/2.2/services/HIVE/configuration/hive-site.xml     | 10 ++++++++++
 ambari-web/app/data/HDP2.2/site_properties.js             |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/120681b8/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
index fb6c0df..1c72f70 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml
@@ -1007,10 +1007,18 @@ limitations under the License.
   <property>
     <name>hive.heapsize</name>
     <value>1024</value>
+    <deleted>true</deleted>
     <description>Hive Java heap size</description>
   </property>
 
   <property>
+    <name>hive.server2.enable.impersonation</name>
+    <value>true</value>
+    <deleted>true</deleted>
+    <description>Enable user impersonation for HiveServer2</description>
+  </property>
+
+  <property>
     <name>ambari.hive.db.schema.name</name>
     <value>hive</value>
     <description>Database name used as the Hive Metastore</description>
@@ -1019,12 +1027,14 @@ limitations under the License.
   <property>
     <name>hive.auto.convert.sortmerge.join.noconditionaltask</name>
     <value>true</value>
+    <deleted>true</deleted>
     <description>Required to Enable the conversion of an SMB (Sort-Merge-Bucket) to a map-join SMB.</description>
   </property>
 
   <property>
     <name>hive.optimize.mapjoin.mapreduce</name>
     <value>true</value>
+    <deleted>true</deleted>
     <description>If hive.auto.convert.join is off, this parameter does not take
       affect. If it is on, and if there are map-join jobs followed by a map-reduce
       job (for e.g a group by), each map-only job is merged with the following

http://git-wip-us.apache.org/repos/asf/ambari/blob/120681b8/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index 589057f..efc6cb9 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -37,7 +37,8 @@ var excludedConfigs = [
   'tez.runtime.intermediate-input.is-compressed',
   'tez.runtime.intermediate-output.compress.codec',
   'tez.runtime.intermediate-output.should-compress',
-  'dfs.datanode.data.dir'
+  'dfs.datanode.data.dir',
+  'hive.heapsize'
 ];
 var hdp22properties = hdp2properties.filter(function (item) {
   return !excludedConfigs.contains(item.name);