Rohit Yadav c37060a1ff CLOUDSTACK-8338: Fix hypervisor stats reporting for KVM on EL7 ... EL7 has a different output to 'free', use /proc/meminfo instead of a tool to be more consistent across distros (cherry picked from commit 212a05a345) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java		2015-05-22 12:10:54 +01:00
..
baremetal	Merge branch 'volume-upload' into master	2015-04-29 11:12:53 +05:30
hyperv	CLOUDSTACK-8431: [Hyper-V] Fixed VM deployment failing when the stale vhd already exists Now generating guid when the template copy from secondary to primary storage requested instead of using it same as secondary	2015-04-30 16:07:36 +05:30
kvm	CLOUDSTACK-8338: Fix hypervisor stats reporting for KVM on EL7	2015-05-22 12:10:54 +01:00
ovm	CLOUDSTACK-8088: VM scale up is failing in vmware with Unable to execute ScaleVmCommand due to java.lang.NullPointerException	2014-12-18 14:27:55 +05:30
ovm3	imports in test	2015-03-27 15:59:32 +01:00
simulator	Merge branch 'volume-upload' into master	2015-04-29 11:12:53 +05:30
ucs	removed executable flags from java classes	2014-11-23 19:49:01 +01:00
vmware	CLOUDSTACK-8412. VM migration with storage fails.	2015-04-28 10:22:00 +05:30
xenserver	CLOUDSTACK-8502	2015-05-21 13:59:49 +02:00