etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/client
History
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
..
WEB-INF Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
bindir Summary: update packaging 2013-02-05 10:47:42 +01:00
distro init: Explicitly set the HOME variable to the homedir of the user cloud 2013-01-09 13:11:21 +01:00
resources/META-INF/cloudstack Spring Modularization 2013-10-02 15:41:04 -07:00
tomcatconf Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
pom.xml Configuration to enable Spring Modularization 2013-10-02 15:43:11 -07:00