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

..

ant/apache-ant-1.7.1

Source code committed

2010-08-11 09:13:29 -07:00

gcc

Source code committed

2010-08-11 09:13:29 -07:00

junit

bug 8529: propagated to master. Added junit test support to ant

2011-02-16 17:40:59 -08:00

migration

move migration to tools directory

2011-08-24 10:46:55 -07:00

mockito

added mockito for mocking

2011-03-19 11:46:18 -07:00

test

fix cloudkit setup, to use new image

2011-07-08 13:49:53 -07:00

testClient

Merge branch 'newagentmgr'

2011-10-27 11:09:56 -07:00

tooljars

move cloud-selenium*.jar to tools

2011-08-30 10:44:58 -07:00

vhd-tools

remove timestamp check for vhd-util check

2011-03-07 19:47:29 -08:00

waf

more file changes

2010-09-09 13:27:20 -07:00

.classpath

eclipse classpath fix

2011-08-31 15:51:19 -07:00

.project

add sample code to config advanced zone

2011-08-19 18:06:11 -07:00