cloudstack/server/test/org/apache/cloudstack
Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -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 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96' 2013-10-23 12:31:53 -07:00