Kris McQueen 848ce60097 Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.		2010-09-28 15:47:14 -07:00
..
src/com/cloud	Merging master into 2.1.refactor, resolve the merge conflicts as best I can. New commands related to extracting template/iso/volume and related to instance groups were refactored to the new API framework.	2010-09-28 15:47:14 -07:00
test/com/cloud	Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss	2010-08-23 12:12:45 -07:00
.classpath	working through some compilation errors that have arisen due to all the API refactoring...	2010-09-13 14:46:23 -07:00
.project	Source code committed	2010-08-11 09:13:29 -07:00