Bharat Kumar 980b227817 recalculate the capacity after overcomit change. ... Conflicts: server/src/com/cloud/capacity/CapacityManager.java server/src/com/cloud/capacity/CapacityManagerImpl.java server/src/com/cloud/resource/ResourceManagerImpl.java server/src/com/cloud/vm/VirtualMachineManagerImpl.java		2013-07-31 18:39:14 +05:30
..
conf	Changed the log4j config files to log org.apache.cloudstack in debug and change the layout format	2013-07-26 20:35:49 -07:00
resources/com/cloud/upgrade	CLOUDSTACK-1818: add a missing file that is missed in previous patch	2013-03-29 11:12:36 -07:00
scripts	License header updates for the server folder.	2012-08-03 09:41:27 -04:00
src	recalculate the capacity after overcomit change.	2013-07-31 18:39:14 +05:30
test	Separate agentmanager from server code. Moved out ssvm. Remove methods that shouldn't be used	2013-07-29 19:13:31 -07:00
pom.xml	Added commons io to server	2013-07-30 14:07:21 -07:00