Merge branch 'master' into unstable

This commit is contained in:
Julien Duponchelle committed 2015-05-14 19:29:30 +02:00
commit 743187bb2e
8 files changed
+90 -27

No files matched your search

+1 -1
View File
@@ -275,7 +275,7 @@ def test_build_command(vm, loop, fake_qemu_binary, port_manager):
"-net",
"none",
"-device",
"e1000,mac=00:00:ab:0e:0f:00",
"e1000,mac=00:00:ab:0e:0f:00"
]