gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-08 15:48:29 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity
df728fcf41
cloudstack-mirror/server/test/org/apache
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
..
cloudstack Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00