From 1b71e424061e3a30aa6f61ba37989095db05063f Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Mon, 13 Oct 2014 12:23:59 -0700
Subject: [PATCH] Combine query for bug 1380741 into bug 1353939

Bug 1380741 was marked a duplicate of bug 1353939
so combine the queries with an OR.  Delete the query
for bug 1380741.

This gives us 28 hits in 7 days, check and gate, all
failures.

Change-Id: I3de620a91322e83d8a66093c8a7890eda2928ccf
Related-Bug: #1353939
---
 queries/1353939.yaml | 12 ++++++++----
 queries/1380741.yaml |  6 ------
 2 files changed, 8 insertions(+), 10 deletions(-)
 delete mode 100644 queries/1380741.yaml

diff --git a/queries/1353939.yaml b/queries/1353939.yaml
index 2a299958..d067f597 100644
--- a/queries/1353939.yaml
+++ b/queries/1353939.yaml
@@ -1,5 +1,9 @@
 query: >
-  message:"Failed to terminate process"
-  AND message:"InstanceNotRescuable"
-  AND message:"Exception during message handling"
-  AND tags:"screen-n-cpu.txt"
+  ((message:"Failed to terminate process"
+    AND message:"InstanceNotRescuable"
+    AND message:"Exception during message handling") OR
+   (message:"_destroy" AND
+    message:"libvirtError: Failed to terminate process" AND
+    message:"with SIGKILL: Device or resource busy" AND
+    module:"nova.compute.manager")) AND
+  tags:"screen-n-cpu.txt"
diff --git a/queries/1380741.yaml b/queries/1380741.yaml
deleted file mode 100644
index fc0ac6dc..00000000
--- a/queries/1380741.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-query: >
-  message:"_destroy" AND
-  message:"libvirtError: Failed to terminate process" AND
-  message:"with SIGKILL: Device or resource busy" AND
-  module:"nova.compute.manager" AND
-  tags:"screen-n-cpu.txt"