etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/engine/storage
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
..
cache Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
datamotion Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
image Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
integration-test Added categorized sorting to SnapshotStrategy and DataMotionStrategy 2013-10-14 15:20:42 -07:00
resources/META-INF/cloudstack Spring Modularization 2013-10-02 15:41:04 -07:00
snapshot Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
src/org/apache/cloudstack/storage Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
volume Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
pom.xml Updating pom.xml version numbers for release 4.3.0-SNAPSHOT 2013-08-01 10:35:00 -04:00
storage.ucls Fix license on xml.in, jsp and ucls files on javelin 2013-01-12 06:34:34 -08:00