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
..
deployment-planners	Moved out user concentrated pod deployment planner to plugins/deployment-planners/user-concentrated-pod	2012-06-25 17:58:45 -07:00
file-systems/netapp	moving out NetApp code to plugins/file-systems/netapp	2012-07-02 08:34:02 -07:00
host-allocators/random	moving out random host allocator to plugins/host-allocators/random/	2012-06-25 18:47:47 -07:00
hypervisors	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
network-elements	Merge branch 'master' into vpc	2012-07-03 17:32:50 -07:00
storage-allocators/random	moving random storage allocator to plugins/storage-allocators	2012-06-26 15:17:25 -07:00
user-authenticators	moving out plaintext authenticator to plugins/user-authenticators	2012-06-26 14:33:27 -07:00