Alena Prokharchyk 31f9d718fb Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java		2012-07-03 17:32:50 -07:00
..
allocator	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
dao	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
download	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
listener	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
monitor	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
resource	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
secondary	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
snapshot	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
swift	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
upload	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
LocalStoragePoolListener.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
OCFS2Manager.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
OCFS2ManagerImpl.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
StorageManager.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
StorageManagerImpl.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00
StorageMigrationCleanupMaid.java	Patch from Chip Childers	2012-07-02 09:51:21 -04:00