You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sw...@apache.org on 2013/04/11 01:06:05 UTC

svn commit: r1466727 - in /incubator/ambari/trunk: CHANGES.txt ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

Author: swagle
Date: Wed Apr 10 23:06:05 2013
New Revision: 1466727

URL: http://svn.apache.org/r1466727
Log:
AMBARI-1868. Include stack version as a parameter in manifest. (swagle)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1466727&r1=1466726&r2=1466727&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Apr 10 23:06:05 2013
@@ -12,6 +12,8 @@ Trunk (unreleased changes):
 
  NEW FEATURES
 
+ AMBARI-1868. Include stack version as a parameter in manifest. (swagle)
+
  AMBARI-1847. Make single PUT call for multiple host overrides. (srimanth)
 
  AMBARI-1857. Capacity Scheduler: field order for Add/Edit popup. (yusaku via srimanth)

Modified: incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java?rev=1466727&r1=1466726&r2=1466727&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java (original)
+++ incubator/ambari/trunk/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java Wed Apr 10 23:06:05 2013
@@ -956,6 +956,7 @@ public class AmbariManagementControllerI
     Map<String, String> params = new TreeMap<String, String>();
     params.put("repo_info", repoInfo);
     params.put("jdk_location", this.jdkResourceUrl);
+    params.put("stack_version", stackId.getStackVersion());
     execCmd.setHostLevelParams(params);
 
     Map<String, String> roleParams = new TreeMap<String, String>();
@@ -4011,6 +4012,7 @@ public class AmbariManagementControllerI
 
     Map<String, String> params = new TreeMap<String, String>();
     params.put("jdk_location", this.jdkResourceUrl);
+    params.put("stack_version", cluster.getDesiredStackVersion().getStackVersion());
     execCmd.setHostLevelParams(params);
 
     // Generate cluster host info
@@ -4069,8 +4071,11 @@ public class AmbariManagementControllerI
 
     execCmd.setConfigurations(configurations);
 
+    Cluster cluster = clusters.getCluster(clusterName);
     Map<String, String> params = new TreeMap<String, String>();
     params.put("jdk_location", this.jdkResourceUrl);
+    params.put("stack_version", cluster.getDesiredStackVersion()
+      .getStackVersion());
     execCmd.setHostLevelParams(params);
 
   }