You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by om...@apache.org on 2012/05/11 17:41:53 UTC
svn commit: r1337215 - in /incubator/ambari/branches/ambari-186: CHANGES.txt
hmc/php/puppet/PuppetInvoker.php
Author: omalley
Date: Fri May 11 15:41:53 2012
New Revision: 1337215
URL: http://svn.apache.org/viewvc?rev=1337215&view=rev
Log:
AMBARI-206. Fix undefined variable in orchestrator. (hitest via omalley)
Modified:
incubator/ambari/branches/ambari-186/CHANGES.txt
incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php
Modified: incubator/ambari/branches/ambari-186/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/CHANGES.txt?rev=1337215&r1=1337214&r2=1337215&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/CHANGES.txt (original)
+++ incubator/ambari/branches/ambari-186/CHANGES.txt Fri May 11 15:41:53 2012
@@ -2,6 +2,8 @@ Ambari Change log
Release 0.x.x - unreleased
+ AMBARI-206. Fix undefined variable in orchestrator. (hitest via omalley)
+
AMBARI-208. Support filtering hosts based on discovery status. (hitesh
via omalley)
Modified: incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php?rev=1337215&r1=1337214&r2=1337215&view=diff
==============================================================================
--- incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php (original)
+++ incubator/ambari/branches/ambari-186/hmc/php/puppet/PuppetInvoker.php Fri May 11 15:41:53 2012
@@ -176,7 +176,7 @@
*This is public only for testing, don't use this method directly
*/
public function genKickWait($nodes, $txnId, $clusterId, $hostInfo,
- $configInfo, $hostRolesStates, $hostAttributes, $manifestDir, $versionFile,
+ $configInfo, $hostRolesStates, $hostAttributes, $manifestDir, $versionFile,
$dryRun) {
$failedNodes = array();
$kickedNodes = array();
@@ -197,14 +197,16 @@
return array( "result" => 0 , "error" => "",
KICKFAILED => array(),
FAILEDNODES => array(),
- SUCCESSFULLNODES => array()
+ SUCCESSFULLNODES => array(),
+ TIMEDOUTNODES => array()
);
}
if ($dryRun) {
return array( "result" => 0 , "error" => "",
KICKFAILED => array(),
FAILEDNODES => array(),
- SUCCESSFULLNODES => $nodes
+ SUCCESSFULLNODES => $nodes,
+ TIMEDOUTNODES => array()
);
}
if (count($kickedNodes) > 0) {