Commit Graph

1564 Commits

Author SHA1 Message Date
alena 46c331b54b Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/storage/StorageManagerImpl.java
2010-08-18 15:52:23 -07:00
alena f1b95641cb Refactor api deletePool, addHost, addSecondaryStorage 2010-08-18 15:41:16 -07:00
abhishek 716271fca1 Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor 2010-08-18 14:05:45 -07:00
abhishek aa6e9ab2bb Refactoring the startvm command 2010-08-18 14:01:15 -07:00
Alex Huang b250b985ec changes 2010-08-18 12:19:22 -07:00
alena e2950eb5a1 Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor
Conflicts:
	server/src/com/cloud/api/BaseCmd.java
	server/src/com/cloud/network/security/NetworkGroupManagerImpl.java
2010-08-18 11:36:05 -07:00
alena 3d85fdf687 API refactor 2010-08-18 11:24:29 -07:00
abhishek 1174486e27 Refactoring into server project 2010-08-17 16:43:57 -07:00
abhishek 7e502768ed Incremental checkin 2010-08-17 16:07:48 -07:00
Alex Huang a89aad4d15 removed override 2010-08-17 10:16:16 -07:00
Alex Huang 867b43dcf9 more changes for the rewrite. 2010-08-16 11:28:11 -07:00
Manuel Amador (Rudd-O) 14ae76781e Committing Kris' big merge 2010-08-11 16:02:57 -07:00
Manuel Amador (Rudd-O) ac730ec496 Branch 2.1.refactor committed 2010-08-11 09:13:42 -07:00
Manuel Amador (Rudd-O) 05c020e1f6 Source code committed 2010-08-11 09:13:29 -07:00