Marcus Sorensen c541f15dcd Merge branch 'master' into resizevolume ... Conflicts: test/integration/smoke/test_volumes.py		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
test_disk_offerings.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_hosts.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_iso.py	integration test fix: test iso - obj reference within classmethod	2013-01-10 20:29:12 +05:30
test_network.py	Summary: Removing ostypeid dependencies from tests	2012-11-29 15:41:56 -08:00
test_primary_storage.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_routers.py	Summary: Modifying integration tests to use 128MB service offerings	2013-01-16 10:30:31 -07:00
test_secondary_storage.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_service_offerings.py	Summary: Modifying integration tests to use 128MB service offerings	2013-01-16 10:30:31 -07:00
test_ssvm.py	fixing sed replace typo	2012-11-09 18:56:23 +05:30
test_templates.py	Summary: Modifying integration tests to use 128MB service offerings	2013-01-16 10:30:31 -07:00
test_vm_life_cycle.py	Summary: Modifying integration tests to use 128MB service offerings	2013-01-16 10:30:31 -07:00
test_volumes.py	Merge branch 'master' into resizevolume	2013-01-16 14:00:48 -07:00