cloudstack

Author	SHA1	Message	Date
Bharat Kumar	6e9bf56cf1	Fix for incorect capacity displayed at the db. Conflicts: engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java server/src/com/cloud/alert/AlertManagerImpl.java server/src/com/cloud/api/ApiResponseHelper.java	2013-07-30 22:13:44 +05:30
Bharat Kumar	956a2a68ce	Incorportaed the review changes Now dhcpservice IPs are removed when last vm from the subnet is removed. Signed-off-by: Abhinandan Prateek <aprateek@apache.org>	2013-07-17 16:53:11 +05:30
Harikrishna Patnala	c0591531d8	CLOUDSTACK-3187: cluster.(cpu/memory).allocated.capacity.disablethreshold in not considering overcommit factor. cluster is getting disable based on actual use Signed-off-by: Abhinandan Prateek <aprateek@apache.org>	2013-06-26 16:02:21 +05:30
Harikrishna Patnala	a30f9fa64a	Fix for CLOUDSTACK-1704 and CLOUDSTACK-1622 Signed-off-by: Abhinandan Prateek <aprateek@apache.org>	2013-06-12 15:01:59 +05:30
Nitin Mehta	c11dbad9c9	merge master	2013-05-11 15:28:43 +05:30