etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cloudstack/server/test
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
..
com/cloud Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
org/apache/cloudstack Merge remote-tracking branch 'origin/txn-refactor' 2013-10-23 10:40:44 -07:00
resources Revert "CLOUDSTACK-3357: dnsmasq on vpc-routervm" 2013-07-21 22:23:48 -07:00
async-job-component.xml CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
sync-queue-component.xml License header updates for the server folder. 2012-08-03 09:41:27 -04:00