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

..

src/com/cloud

Merge branch '2.1.refactor' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.1.refactor

2010-08-18 11:36:05 -07:00

test/com/cloud

Committing Kris' big merge

2010-08-11 16:02:57 -07:00

.classpath

Committing Kris' big merge

2010-08-11 16:02:57 -07:00

.project

Source code committed

2010-08-11 09:13:29 -07:00