Alex Huang abbae2aa87 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
..
dao	merge master	2013-05-11 15:28:43 +05:30
snapshot	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00
DeploymentPlanningManagerImplTest.java	Revert "Reverting the range of commits that broke the build"	2013-08-08 15:02:40 -07:00
UserVmManagerTest.java	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