Alena Prokharchyk 6420ecbd6f Merge branch 'master' into vpc ... Conflicts: server/src/com/cloud/server/ManagementServerImpl.java		2012-07-24 16:13:06 -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	Resource tags: 1) Remove tag records when correspdonding cloudStack object gets removed	2012-07-06 11:43:31 -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-24 16:13:06 -07:00
network-elements	Merge branch 'master' into vpc	2012-07-24 16:13:06 -07:00
storage-allocators/random	fixing some more license headers	2012-07-20 15:59:31 -04:00
user-authenticators	fixing some more license headers	2012-07-20 15:59:31 -04:00