etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/agent-simulator
History
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
..
db move simulator/test to opensource 2011-08-24 10:37:30 -07:00
scripts bulk destroy tests for zucchini 2011-09-20 12:53:07 +05:30
src/com/cloud Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
tomcatconf bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager 2011-10-03 16:43:47 -07:00
.classpath change client/.project to client not vmopsClient 2011-09-22 13:37:12 -07:00
.project move simulator/test to opensource 2011-08-24 10:37:30 -07:00