Prachi Damle c8ae2a9d25 API to list planners and set the planner in Service offering ... Conflicts: server/src/com/cloud/server/ManagementServerImpl.java setup/db/db/schema-410to420.sql		2013-04-11 13:22:56 -07:00
..
bindir	packaging: move jasypt jar to cloudstack-common	2013-04-05 16:12:27 +02:00
db	API to list planners and set the planner in Service offering	2013-04-11 13:22:56 -07:00
dev	maven+marvin: Fix up the activation property	2013-04-10 16:16:41 +05:30