cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/4.5 to f54d266
Date Fri, 14 Aug 2015 07:51:27 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 7055b2280 -> f54d266c8


BUG-ID:CLOUDSTACK-7472: kvmclock fix for LXC is not required after fixing CLOUDSTACK-8177

This closes #557

(cherry picked from commit 3a19a8916eb7840302882cddd8465ac56150d32d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java


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

Branch: refs/heads/4.5
Commit: f54d266c8b6c6e0333eeaa0021861b28e1ea2360
Parents: 7055b22
Author: Kishan Kavala <kishan@apache.org>
Authored: Thu Jul 2 16:52:46 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Aug 14 13:20:56 2015 +0530

----------------------------------------------------------------------
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java   | 3 ---
 1 file changed, 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f54d266c/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 acd5e94..ae48783 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -817,9 +817,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);


Mime
View raw message