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 159901835C for ; Wed, 8 Jul 2015 19:19:49 +0000 (UTC) Received: (qmail 89402 invoked by uid 500); 8 Jul 2015 19:19:37 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 89327 invoked by uid 500); 8 Jul 2015 19:19:37 -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 88672 invoked by uid 99); 8 Jul 2015 19:19:36 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 19:19:36 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A489EE35C7; Wed, 8 Jul 2015 19:19:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: widodh@apache.org To: commits@cloudstack.apache.org Date: Wed, 08 Jul 2015 19:20:05 -0000 Message-Id: <403c4ed2b9ed466c8fe93fd5540381e5@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [30/50] [abbrv] git commit: updated refs/heads/reporter to 28300b5 BUG-ID:CLOUDSTACK-7472: kvmclock fix for LXC is not required after fixing CLOUDSTACK-8177 Signed-off-by: Rohit Yadav This closes #557 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a19a891 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a19a891 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a19a891 Branch: refs/heads/reporter Commit: 3a19a8916eb7840302882cddd8465ac56150d32d Parents: f138192 Author: Kishan Kavala Authored: Thu Jul 2 16:52:46 2015 +0530 Committer: Rohit Yadav Committed: Fri Jul 3 15:21:18 2015 +0530 ---------------------------------------------------------------------- .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a19a891/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 7bd02d0..82b2792 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -783,9 +783,6 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv value = (String) params.get("kvmclock.disable"); if (Boolean.parseBoolean(value)) { _noKvmClock = true; - } else if(HypervisorType.LXC.equals(_hypervisorType) && value == null){ - //Disable kvmclock by default for LXC - _noKvmClock = true; } LibvirtConnection.initialize(_hypervisorURI);