You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2015/03/20 12:56:21 UTC

[1/2] ambari git commit: AMBARI-10150. tez missing from exectype in pig-properties (dlysnichenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk b3666a3ed -> 1a89565f1


AMBARI-10150. tez missing from exectype in pig-properties (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: 458363fe240860964e14b34f01e461cdb8711632
Parents: b3666a3
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Mar 20 13:54:22 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Mar 20 13:54:22 2015 +0200

----------------------------------------------------------------------
 .../PIG/0.12.0.2.0/configuration/pig-properties.xml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/458363fe/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
index 59cc0c4..7916680 100644
--- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
+++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/configuration/pig-properties.xml
@@ -55,7 +55,7 @@ debug=INFO
 # verbose print all log messages to screen (default to print only INFO and above to screen)
 verbose=false
 
-# exectype local|mapreduce, mapreduce is default
+# exectype local|mapreduce|tez, mapreduce is default
 exectype=mapreduce
 
 # Enable insertion of information about script into hadoop job conf 


[2/2] ambari git commit: AMBARI-10152. JDK setup option text is inconsistent (dlysnichenko)

Posted by dm...@apache.org.
AMBARI-10152. JDK setup option text is inconsistent (dlysnichenko)


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

Branch: refs/heads/trunk
Commit: 1a89565f170fb934227f99bf7d3a62d8979e447c
Parents: 458363f
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Mar 20 13:55:35 2015 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Mar 20 13:55:35 2015 +0200

----------------------------------------------------------------------
 ambari-server/src/main/python/ambari_server/serverSetup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/1a89565f/ambari-server/src/main/python/ambari_server/serverSetup.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari_server/serverSetup.py b/ambari-server/src/main/python/ambari_server/serverSetup.py
index 408d9b8..7b86fb2 100644
--- a/ambari-server/src/main/python/ambari_server/serverSetup.py
+++ b/ambari-server/src/main/python/ambari_server/serverSetup.py
@@ -66,7 +66,6 @@ MAKE_FILE_EXECUTABLE_CMD = "chmod a+x {0}"
 UNTAR_JDK_ARCHIVE = "tar --no-same-owner -xvf {0}"
 
 JDK_PROMPT = "[{0}] {1}\n"
-JDK_CUSTOM_CHOICE_PROMPT = "[{0}] - Custom JDK\n==============================================================================\nEnter choice ({1}): "
 JDK_VALID_CHOICES = "^[{0}{1:d}]$"
 
 def get_supported_jdbc_drivers():
@@ -312,7 +311,7 @@ class JDKSetup(object):
     self.JDK_DEFAULT_CONFIGS = []
 
     self.JDK_PROMPT = "[{0}] {1}\n"
-    self.JDK_CUSTOM_CHOICE_PROMPT = "[{0}] - Custom JDK\n==============================================================================\nEnter choice ({1}): "
+    self.JDK_CUSTOM_CHOICE_PROMPT = "[{0}] Custom JDK\n==============================================================================\nEnter choice ({1}): "
     self.JDK_VALID_CHOICES = "^[{0}{1:d}]$"
     self.JDK_MIN_FILESIZE = 5000
     self.JAVA_BIN = ""