etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/framework
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
..
cluster Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
config Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
db Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
events Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
ipc Spring Modularization 2013-10-02 15:41:04 -07:00
jobs Merge remote-tracking branch 'origin/spring-modularization' 2013-10-23 11:14:42 -07:00
managed-context Add Manage Context framework 2013-10-02 13:09:52 -07:00
rest Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
spring Spring Modularization 2013-10-02 15:41:04 -07:00
pom.xml Spring Modularization 2013-10-02 15:41:04 -07:00