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

..

deploy

Add license header to files

2011-04-14 11:23:14 -07:00

.gitignore

more changes for the rewrite.

2010-08-16 11:28:11 -07:00

.project

bug 5890,5873: Try multiple bug checkins

2010-08-11 09:59:25 -07:00

build-cloud.properties

Make secondary storage VM support premium version and opensource version

2011-02-18 17:10:20 -08:00

build-cloud.xml

correct ant build-apidoc

2011-10-18 14:40:28 -07:00

build-common.xml

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

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

build-docs.xml

merge thridparty to deps

2011-08-25 14:32:19 -07:00

build-tests.xml

put comipiling jar files to deps.classpath

2011-08-30 13:58:22 -07:00

build-usage.xml

partly bring usage back to spec file to work around rpm build

2011-08-31 17:25:17 -07:00

cloud.properties

fixed a template creation bug

2011-06-28 19:17:34 -07:00

developer.xml

Merge branch 'newagentmgr'

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

overview.html

Source code committed

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

package.xml

add usage back to spec file

2011-09-14 14:59:27 -07:00

release-notes

Source code committed

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

replace.properties

add template for simulator

2011-08-16 10:30:51 -07:00