anthony 288a36d09f Merge branch '2.2.4' ...

Conflicts:
	api/src/com/cloud/configuration/ConfigurationService.java
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-21to22.sql
	setup/db/db/schema-222to224.sql
	utils/src/com/cloud/utils/exception/ExceptionUtil.java

2011-04-05 12:04:09 -07:00

..

bindir

If git build sccs file is present, catenate it to standard output with these brand new commands

2010-08-11 18:14:55 -07:00

conf

Source code committed

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

src

Merge branch '2.2.4'

2011-04-05 12:04:09 -07:00

test

add support to run scripts on usage DB

2011-04-05 16:11:02 +05:30

.classpath

Fix Eclipse project settings for separation of JUnit

2011-02-17 09:55:05 -08:00

.project

Source code committed

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