Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack

2012-08-08 00:12:39 -07:00 · 2012-08-08 00:12:39 -07:00 · 9c22d43e81
parent 8ad0cab2b1 a60ea41137
commit 9c22d43e81
2 changed files with 2 additions and 1 deletions
--- a/docs/en-US/release-notes-3.0.4.ent
+++ b/docs/en-US/release-notes-3.0.4.ent
@ -0,0 +1 @@
+cloudstack.ent
--- a/python/lib/cloudutils/syscfg.py
+++ b/python/lib/cloudutils/syscfg.py
@ -73,7 +73,7 @@ class sysConfig(object):

        for service in self.services:
            if not service.configration():
-                raise CloudInternalException()
+                raise CloudInternalException("Configuration failed for service %s" % service.serviceName)
    
    def restore(self):
        for service in self.services: