Rohit Yadav 95f1de89b4 Merge branch '4.9' ... Conflicts: engine/schema/src/com/cloud/upgrade/DatabaseUpgradeChecker.java engine/schema/test/com/cloud/upgrade/DatabaseUpgradeCheckerTest.java tools/marvin/setup.py This fixes class names to make things consistent as per the 4.9 PR on master. Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>		2016-09-02 23:08:49 +05:30
..
bindir	add DHCP lease folders for Ubuntu	2016-05-18 23:34:19 +02:00
db	Merge branch '4.9'	2016-09-02 23:08:49 +05:30
dev	travis: Use patched version of ipmitool for tests	2016-05-12 11:05:40 +05:30