cloudstack/agent-simulator/src/com/cloud
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
..
agent Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
api/commands Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
configuration move simulator/test to opensource 2011-08-24 10:37:30 -07:00
resource Bug 11522 - New agent manager 2011-10-18 17:58:15 -07:00
server move simulator/test to opensource 2011-08-24 10:37:30 -07:00
simulator [Simulator] Add API to configure simualtor: you can configure which command can be simulated, or how long it will wait for each command, for which zone/pod/cluster/host etc. 2011-09-30 18:21:28 -07:00