cloudstack/engine/orchestration
Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -07:00
..
resources/META-INF/cloudstack/core Spring Modularization 2013-10-02 15:41:04 -07:00
src Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96' 2013-10-23 12:31:53 -07:00
test Fix a few xml wellformedness issues 2013-09-21 14:58:56 +08:00
pom.xml Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00