You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/08/12 21:01:39 UTC

[1/2] git commit: AMBARI-2873. Version numbers are not accurate for various 1.4.0 stack components. (smohanty)

Updated Branches:
  refs/heads/trunk dd35a6d54 -> da8d55e0b


AMBARI-2873. Version numbers are not accurate for various 1.4.0 stack components. (smohanty)


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

Branch: refs/heads/trunk
Commit: df0821dfa019166bd49258abf6d4e4c3c19cc295
Parents: dd35a6d
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Aug 12 10:57:35 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Aug 12 10:57:35 2013 -0700

----------------------------------------------------------------------
 .../main/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml  | 2 +-
 .../main/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml | 2 +-
 .../main/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml   | 2 +-
 .../main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml    | 2 +-
 .../src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml  | 2 +-
 .../main/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml  | 2 +-
 .../resources/stacks/HDPLocal/2.0.5/services/GANGLIA/metainfo.xml  | 2 +-
 .../resources/stacks/HDPLocal/2.0.5/services/HCATALOG/metainfo.xml | 2 +-
 .../resources/stacks/HDPLocal/2.0.5/services/NAGIOS/metainfo.xml   | 2 +-
 .../resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml    | 2 +-
 .../main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml | 2 +-
 .../resources/stacks/HDPLocal/2.0.5/services/WEBHCAT/metainfo.xml  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
index 395bb4f..9f7444b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/GANGLIA/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>Ganglia Metrics Collection system</comment>
-    <version>3.2.0</version>
+    <version>3.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
index 0094a1c..a2f075b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/HCATALOG/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>This is comment for HCATALOG service</comment>
-    <version>0.11.0.2.0.3.0</version>
+    <version>0.11.0.2.0.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
index bd7de07..76471cf 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/NAGIOS/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>Nagios Monitoring and Alerting system</comment>
-    <version>3.2.3</version>
+    <version>3.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
index 51c71c1..affbe85 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/OOZIE/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
-    <version>3.3.2.2.0.3.0</version>
+    <version>3.3.2.2.0.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
index 9b30ddb..84cf04e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/PIG/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>Scripting platform for analyzing large datasets</comment>
-    <version>0.11.2.0.3.0</version>
+    <version>0.11.1.2.0.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
index 58a9fb8..1ee2f7d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.0.5/services/WEBHCAT/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>This is comment for WEBHCAT service</comment>
-    <version>0.11.0.2.0.3.0</version>
+    <version>0.11.0.2.0.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/GANGLIA/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/GANGLIA/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/GANGLIA/metainfo.xml
index 395bb4f..9f7444b 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/GANGLIA/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/GANGLIA/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>Ganglia Metrics Collection system</comment>
-    <version>3.2.0</version>
+    <version>3.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HCATALOG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HCATALOG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HCATALOG/metainfo.xml
index 0094a1c..a2f075b 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HCATALOG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/HCATALOG/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>This is comment for HCATALOG service</comment>
-    <version>0.11.0.2.0.3.0</version>
+    <version>0.11.0.2.0.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/NAGIOS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/NAGIOS/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/NAGIOS/metainfo.xml
index bd7de07..76471cf 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/NAGIOS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/NAGIOS/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>Nagios Monitoring and Alerting system</comment>
-    <version>3.2.3</version>
+    <version>3.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml
index 51c71c1..affbe85 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/OOZIE/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>System for workflow coordination and execution of Apache Hadoop jobs</comment>
-    <version>3.3.2.2.0.3.0</version>
+    <version>3.3.2.2.0.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml
index 9b30ddb..84cf04e 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/PIG/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>Scripting platform for analyzing large datasets</comment>
-    <version>0.11.2.0.3.0</version>
+    <version>0.11.1.2.0.5.0</version>
 
     <components>
         <component>

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/df0821df/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/WEBHCAT/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/WEBHCAT/metainfo.xml b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/WEBHCAT/metainfo.xml
index 58a9fb8..1ee2f7d 100644
--- a/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/WEBHCAT/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDPLocal/2.0.5/services/WEBHCAT/metainfo.xml
@@ -18,7 +18,7 @@
 <metainfo>
     <user>root</user>
     <comment>This is comment for WEBHCAT service</comment>
-    <version>0.11.0.2.0.3.0</version>
+    <version>0.11.0.2.0.5.0</version>
 
     <components>
         <component>


[2/2] git commit: AMBARI-2874. MapReduce2 service check should have a dependency on the result of Yarn service check. (smohanty)

Posted by sm...@apache.org.
AMBARI-2874. MapReduce2 service check should have a dependency on the result of Yarn service check. (smohanty)


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

Branch: refs/heads/trunk
Commit: da8d55e0b5bb90ceaad8ac7af13d3e7824b6d85e
Parents: df0821d
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Aug 12 11:10:13 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Aug 12 11:10:13 2013 -0700

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/metadata/RoleCommandOrder.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/da8d55e0/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
index 8af70e8..f83eb65 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
@@ -337,7 +337,9 @@ public class RoleCommandOrder {
       addDependency(Role.MAPREDUCE2_SERVICE_CHECK, RoleCommand.EXECUTE,
         Role.RESOURCEMANAGER, RoleCommand.START);
       addDependency(Role.MAPREDUCE2_SERVICE_CHECK, RoleCommand.EXECUTE,
-        Role.HISTORYSERVER, RoleCommand.START);
+          Role.HISTORYSERVER, RoleCommand.START);
+      addDependency(Role.MAPREDUCE2_SERVICE_CHECK, RoleCommand.EXECUTE,
+          Role.YARN_SERVICE_CHECK, RoleCommand.EXECUTE);
       addDependency(Role.YARN_SERVICE_CHECK, RoleCommand.EXECUTE,
         Role.NODEMANAGER, RoleCommand.START);
       addDependency(Role.YARN_SERVICE_CHECK, RoleCommand.EXECUTE,