master/product/Vifib/tests/testVifibSlapWebService.py · 1e012c01f502d6813bd1b0f87e8bf8d9ccbd1ddd · nexedi / slapos

Merge branch 'master' into rename_instance · 1e012c01

Antoine Catton authored Jan 18, 2012

Conflicts:
	master/bt5/vifib_base/bt/revision
	master/bt5/vifib_open_trade/bt/revision
	master/bt5/vifib_slap/bt/revision
	master/product/Vifib/tests/testVifibSlapComputerPartitionUpdate.py

1e012c01

testVifibSlapWebService.py 171 KB

Replace testVifibSlapWebService.py