etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,229 Commits 324 Branches 325 Tags 943 MiB
Commit Graph

3 Commits

Author SHA1 Message Date
frank 72d284de7d Switch to Apache license 2012-04-03 04:54:14 -07:00
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
Edison Su ae83246acb bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager 
status 11600: resolved fixed
 2011-10-03 16:43:47 -07:00