Prasanna Santhanam c295341cbd image_data_store is not part of vm_template anymore ... Revert "CLOUDSTACK-1744: It's due to db upgrade issue. On master, deploydb will upgrade db to 4.2, which will update vm_template's image_data_store_id, while deploydb-simulator adds a new column in vm_template table, which doesn't set image_data_store_id, thus causing NPE." This reverts commit 33937c980e. Conflicts: setup/db/templates.simulator.sql Signed-off-by: Prasanna Santhanam <tsp@apache.org>		2013-06-20 16:44:49 +05:30
..
bindir	Cloudstack-2644 [Multiple_IP_Ranges] user data service on VR does not work in case of multiple subnets Cloudstack-2953 [Multiple_IP_Ranges] VM does not get the public key from VR incase of multiple subnets per vlan Also removed some unused code and fixed the an error in the dnsmasq config function	2013-06-20 11:15:15 +05:30
db	image_data_store is not part of vm_template anymore	2013-06-20 16:44:49 +05:30
dev	Fix VPC tests related to user roles	2013-06-17 17:32:05 +05:30