You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/11/21 17:16:59 UTC
git commit: updated refs/heads/master to de6bf74
Updated Branches:
refs/heads/master 433a63191 -> de6bf7470
One more merge conflict
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/de6bf747
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/de6bf747
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/de6bf747
Branch: refs/heads/master
Commit: de6bf7470c63f0df235be96c391b5f825d17d18e
Parents: 433a631
Author: Alex Huang <al...@citrix.com>
Authored: Thu Nov 21 08:16:48 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Thu Nov 21 08:16:48 2013 -0800
----------------------------------------------------------------------
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de6bf747/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index d3f1266..3a3de70 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3791,13 +3791,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
@Override
public ConfigKey<?>[] getConfigKeys() {
-<<<<<<< HEAD
return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait, VmOpLockStateRetry,
VmOpWaitInterval, ExecuteInSequence, VmJobCheckInterval, VmJobTimeout, VmJobStateReportInterval};
-=======
- return new ConfigKey<?>[] {ClusterDeltaSyncInterval, StartRetry, VmDestroyForcestop, VmOpCancelInterval, VmOpCleanupInterval, VmOpCleanupWait,
- VmOpLockStateRetry, VmOpWaitInterval, ExecuteInSequence};
->>>>>>> reformat
}
public List<StoragePoolAllocator> getStoragePoolAllocators() {