From de6bf7470c63f0df235be96c391b5f825d17d18e Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Thu, 21 Nov 2013 08:16:48 -0800 Subject: [PATCH] One more merge conflict --- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java index d3f12664624..3a3de701f9f 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 getStoragePoolAllocators() {