incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1293917 - in /incubator/tashi/branches/stroucki-irpbugs: ./ Makefile src/tashi/clustermanager/clustermanagerservice.py
Date Sun, 26 Feb 2012 19:17:42 GMT
Author: stroucki
Date: Sun Feb 26 19:17:41 2012
New Revision: 1293917

URL: http://svn.apache.org/viewvc?rev=1293917&view=rev
Log:
pull fix from trunk for checkInstances

Modified:
    incubator/tashi/branches/stroucki-irpbugs/   (props changed)
    incubator/tashi/branches/stroucki-irpbugs/Makefile
    incubator/tashi/branches/stroucki-irpbugs/src/tashi/clustermanager/clustermanagerservice.py

Propchange: incubator/tashi/branches/stroucki-irpbugs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 26 19:17:41 2012
@@ -3,4 +3,4 @@
 /incubator/tashi/branches/stroucki-accounting/branches/stroucki-accounting:1221525-1235607
 /incubator/tashi/branches/stroucki-slotsbug:1244839-1245041
 /incubator/tashi/branches/zoni-dev/trunk:1034098-1177646
-/incubator/tashi/trunk:1203846-1292858
+/incubator/tashi/trunk:1203846-1293916

Modified: incubator/tashi/branches/stroucki-irpbugs/Makefile
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-irpbugs/Makefile?rev=1293917&r1=1293916&r2=1293917&view=diff
==============================================================================
--- incubator/tashi/branches/stroucki-irpbugs/Makefile (original)
+++ incubator/tashi/branches/stroucki-irpbugs/Makefile Sun Feb 26 19:17:41 2012
@@ -118,7 +118,7 @@ rmdoc:
 #  Zoni 
 bin/zoni-cli:
 	@echo Symlinking in zoni-cli...
-	(cd bin; ln -s ../src/zoni/client/zoni-cli.py .)
+	(cd bin; ln -s ../src/zoni/client/zoni-cli.py zoni-client)
 # why necessarily put this in /usr/local/bin like nothing else?
 usr/local/bin/zoni:
 	@echo Creating /usr/local/bin/zoni

Modified: incubator/tashi/branches/stroucki-irpbugs/src/tashi/clustermanager/clustermanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/branches/stroucki-irpbugs/src/tashi/clustermanager/clustermanagerservice.py?rev=1293917&r1=1293916&r2=1293917&view=diff
==============================================================================
--- incubator/tashi/branches/stroucki-irpbugs/src/tashi/clustermanager/clustermanagerservice.py
(original)
+++ incubator/tashi/branches/stroucki-irpbugs/src/tashi/clustermanager/clustermanagerservice.py
Sun Feb 26 19:17:41 2012
@@ -280,7 +280,7 @@ class ClusterManagerService(object):
 					if instance.state != InstanceState.Running and \
 					   instance.state != InstanceState.Activating and \
 					   instance.state != InstanceState.Orphaned:
-						self.data.releaseInstance(instanceId)
+						self.data.releaseInstance(instance)
 						continue
 				except:
 					continue



Mime
View raw message