cloudstack/engine/schema/src/com/cloud
Prachi Damle 55eabcff2c Merge branch 'master' into planner_reserve
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade410to420.java
	server/src/com/cloud/server/ManagementServerImpl.java
	setup/db/db/schema-410to420.sql
2013-05-09 17:36:59 -07:00
..
alert Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
capacity Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
certificate Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
cluster Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
configuration Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
dc Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
domain Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
event Removed framework-api which is completely useless. Changed framework-ipc to reference gson itself. Move VOs into engine-schema. 2013-05-06 16:34:16 -07:00
host Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
hypervisor Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
keystore Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
migration Merge branch 'master' into planner_reserve 2013-05-08 17:02:35 -07:00
network CLOUDSTACK-747: Internal LB between VPC tiers support 2013-05-09 11:54:41 -07:00
offerings CLOUDSTACK-747: Internal LB between VPC tiers support 2013-05-09 11:54:41 -07:00
projects Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
secstorage Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
service Merge branch 'master' into planner_reserve 2013-05-08 17:02:35 -07:00
storage Fixed up unit testing to use only an in class TestConfiguration 2013-05-06 16:34:27 -07:00
tags Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
upgrade Merge branch 'master' into planner_reserve 2013-05-09 17:36:59 -07:00
usage Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
user Moved most of the VOs and DAOs from server package into engine-schema as well 2013-05-06 16:34:26 -07:00
vm Merge branch 'master' into planner_reserve 2013-05-09 17:36:59 -07:00