cloudstack/server/test/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 Bug 11522 - New agent manager 2011-10-07 15:51:24 -07:00
async Intermidiate checkin to Project feature: 2011-09-20 18:35:28 -07:00
cluster Bug 11522 - New agent manager 2011-09-29 11:58:41 -07:00
keystore Add keystore management and related JUNIT test case 2011-04-19 16:20:06 -07:00
network Merge branch 'newagentmgr' 2011-10-27 11:09:56 -07:00
snapshot bug 11531: forget to include newly added JUnit test along with the fix, here it is 2011-09-22 16:22:24 -07:00
storage/dao Add more detail when unable to schedule cleanup 2011-09-12 18:22:55 -07:00
upgrade Full opensource 2011-08-23 19:52:19 -07:00
user More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
utils/db New security group mgr WIP : memory based queueing 2011-09-12 18:20:22 -07:00
vm Bug 11522 - New agent manager 2011-10-03 10:32:27 -07:00