You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/06/16 00:38:02 UTC

[2/51] [abbrv] git commit: VPC : fixed get_domr_version

VPC : fixed get_domr_version


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

Branch: refs/heads/vpc
Commit: 418cbe2e175bbf4dc18809b48615a19317f52e66
Parents: 3821558
Author: anthony <an...@cloud.com>
Authored: Wed Jun 13 19:25:48 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Fri Jun 15 14:33:43 2012 -0700

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/vmops |    3 ++-
 wscript                               |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/418cbe2e/scripts/vm/hypervisor/xenserver/vmops
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops
index 51627a8..b34af60 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -302,7 +302,8 @@ def routerProxy(session, args):
     cmd.insert(0, "/bin/bash")
     try:
         txt = util.pread2(cmd)
-        txt = 'success'
+        if txt is None or len(txt) == 0 :
+            txt = 'success'
     except:
         util.SMlog("routerProxy command " + sargs + " failed "  )
         txt = '' 

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/418cbe2e/wscript
----------------------------------------------------------------------
diff --git a/wscript b/wscript
index 66cacd8..7d039fe 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@
 # if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
 
 
-VERSION = '3.0.3.2012-06-13T23:38:49Z'
+VERSION = '3.0.3.2012-06-14T02:14:58Z'
 APPNAME = 'cloud'
 
 import shutil,os