incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1295371 - in /incubator/tashi/trunk: ./ src/tashi/nodemanager/nodemanagerservice.py
Date Thu, 01 Mar 2012 01:31:54 GMT
Author: stroucki
Date: Thu Mar  1 01:31:53 2012
New Revision: 1295371

URL: http://svn.apache.org/viewvc?rev=1295371&view=rev
Log:
another merge element "forgotten" by svn

Modified:
    incubator/tashi/trunk/   (props changed)
    incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py

Propchange: incubator/tashi/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 01:31:53 2012
@@ -1,7 +1,7 @@
 /incubator/tashi/branches/cmu:1178106-1187632
 /incubator/tashi/branches/stable:1241774-1245856
 /incubator/tashi/branches/stablefix:1203848-1241770
-/incubator/tashi/branches/stroucki-accounting:1221525-1241770
+/incubator/tashi/branches/stroucki-accounting:1221525-1295369
 /incubator/tashi/branches/stroucki-accounting/branches/stroucki-accounting:1221525-1235607
 /incubator/tashi/branches/stroucki-irpbugs:1245857-1292894
 /incubator/tashi/branches/stroucki-slotsbug:1244839-1245041

Modified: incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py?rev=1295371&r1=1295370&r2=1295371&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py (original)
+++ incubator/tashi/trunk/src/tashi/nodemanager/nodemanagerservice.py Thu Mar  1 01:31:53
2012
@@ -91,7 +91,7 @@ class NodeManagerService(object):
 		try:
 			if (self.accountingHost is not None) and \
 						(self.accountingPort is not None):
-				self.accountingClient=rpycservices.client(self.accountingHost, self.accountingPort)
+				self.accountingClient = ConnectionManager(self.username, self.password, self.accountingPort)[self.accountingHost]
 		except:
 			self.log.exception("Could not init accounting")
 



Mime
View raw message