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/master to 8295cb0
Date Tue, 23 Jul 2013 22:19:45 GMT
Updated Branches:
  refs/heads/master 089cbb610 -> 8295cb0ac


CLOUDSTACK-3250: Add PvlanSetupCommand into maintenance mode allowed command list

Then the rule in the old host can be cleared.


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

Branch: refs/heads/master
Commit: 8295cb0ac2e63ca5b279e1d1a017aaa0e2f71123
Parents: 089cbb6
Author: Sheng Yang <sheng.yang@citrix.com>
Authored: Tue Jul 23 15:17:16 2013 -0700
Committer: Sheng Yang <sheng.yang@citrix.com>
Committed: Tue Jul 23 15:19:34 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/agent/manager/AgentAttache.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8295cb0a/server/src/com/cloud/agent/manager/AgentAttache.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/agent/manager/AgentAttache.java b/server/src/com/cloud/agent/manager/AgentAttache.java
index 92ce17b..1785bcf 100755
--- a/server/src/com/cloud/agent/manager/AgentAttache.java
+++ b/server/src/com/cloud/agent/manager/AgentAttache.java
@@ -44,6 +44,7 @@ import com.cloud.agent.api.Command;
 import com.cloud.agent.api.MaintainCommand;
 import com.cloud.agent.api.MigrateCommand;
 import com.cloud.agent.api.PingTestCommand;
+import com.cloud.agent.api.PvlanSetupCommand;
 import com.cloud.agent.api.ReadyCommand;
 import com.cloud.agent.api.SetupCommand;
 import com.cloud.agent.api.ShutdownCommand;
@@ -109,7 +110,9 @@ public abstract class AgentAttache {
     protected AgentManagerImpl _agentMgr;
 
     public final static String[] s_commandsAllowedInMaintenanceMode =
-            new String[] { MaintainCommand.class.toString(), MigrateCommand.class.toString(),
StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(),
CheckHealthCommand.class.toString(), ReadyCommand.class.toString(), ShutdownCommand.class.toString(),
SetupCommand.class.toString(), ClusterSyncCommand.class.toString(), CleanupNetworkRulesCmd.class.toString(),
CheckNetworkCommand.class.toString() };
+            new String[] { MaintainCommand.class.toString(), MigrateCommand.class.toString(),
StopCommand.class.toString(), CheckVirtualMachineCommand.class.toString(), PingTestCommand.class.toString(),
+    					   CheckHealthCommand.class.toString(), ReadyCommand.class.toString(), ShutdownCommand.class.toString(),
SetupCommand.class.toString(), ClusterSyncCommand.class.toString(),
+    					   CleanupNetworkRulesCmd.class.toString(), CheckNetworkCommand.class.toString(),
PvlanSetupCommand.class.toString() };
     protected final static String[] s_commandsNotAllowedInConnectingMode =
             new String[] { StartCommand.class.toString(), CreateCommand.class.toString()
};
     static {


Mime
View raw message