cloudstack/utils
frank cef30956e9 Merge branch 'newagentmgr'
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
..
bindir If git build sccs file is present, catenate it to standard output with these brand new commands 2010-08-11 18:14:55 -07:00
certs Update fail-safe keystore with RSA private key 2011-07-25 18:55:16 -07:00
conf bug 11181: adding a param so that mysql can cache the listVM prepared statement sql effectively 2011-09-07 05:50:33 +05:30
src Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
test Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
.classpath new log4j 2011-06-21 10:15:21 -07:00
.project Source code committed 2010-08-11 09:13:29 -07:00
LICENSE bug 9697: encode api response values 2011-06-10 18:10:44 -07:00