Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
src/com/cloud	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00
pom.xml	Core should not depend on xapi, only the xen and ovm plugin.	2012-10-02 10:19:15 -07:00