etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/services/secondary-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
..
resources/META-INF/cloudstack/secondary-storage-discoverer Spring Modularization 2013-10-02 15:41:04 -07:00
src/org/apache/cloudstack/storage CLOUDSTACK-4816:provide configurable option to choose single vs 2013-10-17 10:28:59 -07:00
test/org/apache/cloudstack/storage/resource CIFS support for secondary storage is documented here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/CIFS+Support 2013-09-11 14:23:29 +05:30
pom.xml Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00