cloudstack/server/test/com/cloud
Alena Prokharchyk 0e0b75a041 Merge branch 'master' into vpc
Conflicts:
	api/src/com/cloud/api/ApiConstants.java
2012-08-02 18:45:37 -07:00
..
agent Removed obsolete file SearchCriteria2Test.java which caused ant unittest 2012-08-02 10:33:06 -07:00
async Patch from Chip Childers 2012-07-02 09:51:21 -04:00
cluster Patch from Chip Childers 2012-07-02 09:51:21 -04:00
keystore Patch from Chip Childers 2012-07-02 09:51:21 -04:00
network VPC: moved vpc related code from NetworkManager to VpcManager 2012-08-01 18:45:06 -07:00
snapshot Patch from Chip Childers 2012-07-02 09:51:21 -04:00
storage/dao Patch from Chip Childers 2012-07-02 09:51:21 -04:00
upgrade Patch from Chip Childers 2012-07-02 09:51:21 -04:00
user Fixed broken unittest 2012-07-24 10:30:39 -07:00
utils/db Patch from Chip Childers 2012-07-02 09:51:21 -04:00
vm Merge branch 'master' into vpc 2012-07-31 13:37:28 -07:00