etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/ovm
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
..
scripts/vm/hypervisor/ovm Bug 11740 - OVM - after Primary storage OCFS2 with ISCSI path has been removed, attempt to add back same ISCSI path to Primary storage OCFS2 failed 2011-10-17 13:56:13 -07:00
src/com/cloud/ovm Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
.classpath fixed eclipse classpath 2011-08-31 13:35:37 -07:00
.project add classpath and project file for ovm 2011-08-30 15:59:39 -07:00