gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-07 23:39:32 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity
df728fcf41
cloudstack-mirror/server/test/org/apache/cloudstack
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
..
affinity Changes required to merge to master: 2013-09-03 20:03:11 -07:00
lb Fixed unit tests 2013-09-06 15:40:39 -07:00
networkoffering CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled 2013-10-22 12:44:23 +02:00
privategw Moved NetworkManager to NetworkOrchestrationService 2013-09-06 15:40:31 -07:00
region New Transaction API 2013-10-16 09:21:00 -07:00