Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 63D021017C for ; Thu, 21 Nov 2013 16:17:01 +0000 (UTC) Received: (qmail 37498 invoked by uid 500); 21 Nov 2013 16:17:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 37292 invoked by uid 500); 21 Nov 2013 16:17:00 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 37179 invoked by uid 99); 21 Nov 2013 16:17:00 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 Nov 2013 16:17:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CD8AA89B45B; Thu, 21 Nov 2013 16:16:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to de6bf74 Date: Thu, 21 Nov 2013 16:16:59 +0000 (UTC) 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 Authored: Thu Nov 21 08:16:48 2013 -0800 Committer: Alex Huang 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 getStoragePoolAllocators() {