From d44d6a84a88a4a925fcfdf1ca4fc3cf379706212 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Thu, 1 Jan 2015 17:52:48 +0000
Subject: [PATCH] Delete all job queue entries (regardless of status) when
 deleting device

---
 Netdisco/Changes                                 | 1 +
 Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index d0286d10..8d114239 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -14,6 +14,7 @@
 
   * Fix for node search on some formats of IPv6 addr being seen as MAC
   * [#190] Ignore entries in the discover form that don't look like IP/hostname
+  * Delete all job queue entries (regardless of status) when deleting device
 
 2.029014 - 2014-11-19
 
diff --git a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
index 79050cff..b39a8e2c 100644
--- a/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
+++ b/Netdisco/lib/App/Netdisco/DB/ResultSet/Device.pm
@@ -594,7 +594,6 @@ sub delete {
 
   $schema->resultset('Admin')->search({
     device => { '-in' => $devices->as_query },
-    action => { '-like' => 'queued%' },
   })->delete;
 
   $schema->resultset('Topology')->search({