Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		2013-01-16 14:00:48 -07:00
..
component	marvin tests: marking the xen specific tests	2013-01-03 22:13:14 -08:00
smoke	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00
__init__.py	apply chip childers licensing patches for the test directory	2012-06-26 11:19:58 -04:00