From 5b06162d7da6169a7b7d54c86416df695f75d4f9 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 7 Aug 2013 10:04:11 +0100
Subject: [PATCH] release 2.012002

Squashed commit of the following:

commit 6f80432d0610b42c1456fcd2d9d5552fed25f40e
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Aug 7 10:04:02 2013 +0100

    ready for 2.012002

commit a4a57ac77866b2e4a3381c06cd4d833732218267
Author: Oliver Gorwits <oliver@cpan.org>
Date:   Wed Aug 7 10:03:19 2013 +0100

    Tidy up Device IP after deleting a pseudo device
---
 Netdisco/Changes                                            | 6 ++++++
 Netdisco/META.yml                                           | 2 +-
 Netdisco/lib/App/Netdisco.pm                                | 2 +-
 .../lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm   | 1 +
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 30e1c194..7cacf678 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,3 +1,9 @@
+2.012002 - 2013-08-07
+
+  [BUG FIXES]
+
+  * Tidy up Device IP after deleting a pseudo device
+
 2.012001 - 2013-08-06
 
   [BUG FIXES]
diff --git a/Netdisco/META.yml b/Netdisco/META.yml
index 3b846f9c..4cbaeb99 100644
--- a/Netdisco/META.yml
+++ b/Netdisco/META.yml
@@ -61,4 +61,4 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: git://git.code.sf.net/p/netdisco/netdisco-ng
-version: 2.012001
+version: 2.012002
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index b9163655..765ed760 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -7,7 +7,7 @@ use 5.010_000;
 use File::ShareDir 'dist_dir';
 use Path::Class;
 
-our $VERSION = '2.012001';
+our $VERSION = '2.012002';
 
 BEGIN {
   if (not ($ENV{DANCER_APPDIR} || '')
diff --git a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm b/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm
index 3a2dd0a5..15df943b 100644
--- a/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm
+++ b/Netdisco/lib/App/Netdisco/Web/Plugin/AdminTask/PseudoDevice.pm
@@ -62,6 +62,7 @@ ajax '/ajax/control/admin/pseudodevice/del' => require_role admin => sub {
         ->find({ip => param('ip')});
 
       $device->ports->delete;
+      $device->device_ips->delete;
       $device->delete;
     });
 };