From d46b45cb4acdfaa2853a2a11ae6654ea710ce1d1 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Thu, 16 Jul 2015 22:34:23 +0200 Subject: cherry-pick commits 3893 and 3894 --- bin/virtualization | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/virtualization b/bin/virtualization index f1d043cf..f9d1f1fe 100755 --- a/bin/virtualization +++ b/bin/virtualization @@ -111,7 +111,7 @@ QEMU_ARCH_CONFIG = { 'qemu_bin': 'qemu-system-ppc64', 'qemu_disk_type': QEMU_DISK_TYPE_VIRTIO, 'qemu_extra_args': [ - '-machine', 'prep', + '-machine', 'pseries', ], }, } -- cgit v1.2.3 From 438dda3f95762ff7dfcb698d3d36d8b838006300 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Thu, 16 Jul 2015 22:36:20 +0200 Subject: cherry-pick commit 3896 --- jobs/firmware.txt.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/firmware.txt.in b/jobs/firmware.txt.in index bee0e52a..77970565 100644 --- a/jobs/firmware.txt.in +++ b/jobs/firmware.txt.in @@ -60,5 +60,5 @@ id: firmware/no_ACPI_REV_interface _summary: No _REV interface in ACPI [DS]SDT tables user: root estimated_duration: 0.5 -command: grep -r "_REV" /sys/firmware/acpi/tables/* | grep -v [DS]SDT -_description: This Automated test checks misuse of the _REV interface in ACPI [DS]SDT tables +command: ! sudo grep -r "_REV" /sys/firmware/acpi/tables/* | grep [DS]SDT +_description: This Automated test checks misuse of the _REV interface in ACPI DSDT and SSDT tables -- cgit v1.2.3 From d5c850d750c031186db9e27723e67d0814c356b6 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Thu, 16 Jul 2015 22:56:03 +0200 Subject: providers/plainbox-provider-checkbox: increment version to 0.21.1 --- manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage.py b/manage.py index 3a6990b0..fbafd181 100755 --- a/manage.py +++ b/manage.py @@ -4,7 +4,7 @@ from plainbox.provider_manager import N_ setup( name='2013.com.canonical.certification:checkbox', - version="0.22", + version="0.21.1", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3 From cfa505194da52dfe9154e79d5bc8a6e3c7ab0373 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Thu, 16 Jul 2015 22:56:17 +0200 Subject: providers/plainbox-provider-checkbox: increment version to 0.22.dev0 --- manage.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manage.py b/manage.py index fbafd181..3a6990b0 100755 --- a/manage.py +++ b/manage.py @@ -4,7 +4,7 @@ from plainbox.provider_manager import N_ setup( name='2013.com.canonical.certification:checkbox', - version="0.21.1", + version="0.22", description=N_("Checkbox provider"), gettext_domain='plainbox-provider-checkbox', strict=False, deprecated=False, -- cgit v1.2.3