cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yas...@apache.org
Subject git commit: updated refs/heads/4.2 to 2f85c80
Date Tue, 16 Jul 2013 01:27:02 GMT
Updated Branches:
  refs/heads/4.2 54e9fe448 -> 2f85c8065


CLOUDSTACK-3539: Fix wrong management ip when server start up

The value "localhost" for mgmt server should be over-written anyway.


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

Branch: refs/heads/4.2
Commit: 2f85c806553ffdf390b04a47516e9b580a05f846
Parents: 54e9fe4
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Mon Jul 15 18:25:54 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Mon Jul 15 18:26:41 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/server/ConfigurationServerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f85c806/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 9e79b76..9a9b145 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -235,7 +235,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
             	Boolean devel = Boolean.valueOf(_configDao.getValue("developer"));
             	if (devel) {
             		String value = _configDao.getValue(Config.ManagementHostIPAdr.key());
-            		if (value != null) {
+            		if (value != null && !value.equals("localhost")) {
             			needUpdateHostIp = false;
             		}
             	}


Mime
View raw message