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 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor' 
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 		2013-10-23 10:40:44 -07:00
..
cluster New Transaction API 2013-10-16 09:21:00 -07:00
config Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
db Cleaner and more type safe Transaction API for checked exceptions 2013-10-23 10:02:43 -07:00
events Fixed up the pom.xml to use dependencies specified in cloudstack pom 2013-08-02 13:51:47 -07:00
ipc Add Manage Context framework 2013-10-02 13:09:52 -07:00
jobs New Transaction API 2013-10-16 09:21:00 -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
pom.xml Add Manage Context framework 2013-10-02 13:09:52 -07:00