Kelven Yang 9a2148ffc3 CLOUDSTACK-3886: check in for review request https://reviews.apache.org/r/13008/		2013-09-04 14:49:45 -07:00
..
src	CLOUDSTACK-3886: check in for review request https://reviews.apache.org/r/13008/	2013-09-04 14:49:45 -07:00
test	Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.	2013-08-26 17:31:10 -07:00
pom.xml	Resolved merge conflicts	2013-08-12 20:15:24 -07:00