Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization' ...

Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java

2013-10-23 11:14:42 -07:00

..

resources/META-INF/cloudstack/core

Spring Modularization

2013-10-02 15:41:04 -07:00

src

New Transaction API

2013-10-16 09:21:00 -07:00

pom.xml

Cleanup pom.xml in various projects to properly use managed versions and other defaults

2013-09-21 17:21:06 +08:00