From bcbb253b1aa855268e0b55cb6b586d889f32ca8b Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Wed, 21 May 2014 21:22:49 +0100
Subject: [PATCH] release 2.027005_001

---
 Netdisco/Changes             | 3 ++-
 Netdisco/MANIFEST            | 6 +++++-
 Netdisco/META.yml            | 4 +++-
 Netdisco/lib/App/Netdisco.pm | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 92ef0a81..8b7e2a7f 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,9 +1,10 @@
-2.027005 - 2014-05-15
+2.027005_001 - 2014-05-21
 
   [ENHANCEMENTS]
 
   * Support offline update of oui.txt and MIBs bundle
   * Support Dancer::Debug at runtime with DANCER_DEBUG=1 env var
+  * Merge pluggable job queue branch
 
   [BUG FIXES]
 
diff --git a/Netdisco/MANIFEST b/Netdisco/MANIFEST
index 30a4421c..d735a3d2 100644
--- a/Netdisco/MANIFEST
+++ b/Netdisco/MANIFEST
@@ -20,13 +20,15 @@ inc/Module/Install/Share.pm
 inc/Module/Install/Win32.pm
 inc/Module/Install/WriteAll.pm
 lib/App/Netdisco.pm
+lib/App/Netdisco/Configuration.pm
 lib/App/Netdisco/Core/Arpnip.pm
 lib/App/Netdisco/Core/Discover.pm
 lib/App/Netdisco/Core/Macsuck.pm
 lib/App/Netdisco/Core/Nbtstat.pm
 lib/App/Netdisco/Daemon/DB.pm
 lib/App/Netdisco/Daemon/DB/Result/Admin.pm
-lib/App/Netdisco/Daemon/Queue.pm
+lib/App/Netdisco/Daemon/JobQueue.pm
+lib/App/Netdisco/Daemon/LocalQueue.pm
 lib/App/Netdisco/Daemon/Util.pm
 lib/App/Netdisco/Daemon/Worker/Common.pm
 lib/App/Netdisco/Daemon/Worker/Interactive.pm
@@ -138,6 +140,8 @@ lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql
 lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql
 lib/App/Netdisco/DB/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql
 lib/App/Netdisco/Environment.pm
+lib/App/Netdisco/JobQueue.pm
+lib/App/Netdisco/JobQueue/PostgreSQL.pm
 lib/App/Netdisco/Manual/Configuration.pod
 lib/App/Netdisco/Manual/Deployment.pod
 lib/App/Netdisco/Manual/Developing.pod
diff --git a/Netdisco/META.yml b/Netdisco/META.yml
index 79e6455c..9ee10c9f 100644
--- a/Netdisco/META.yml
+++ b/Netdisco/META.yml
@@ -36,6 +36,7 @@ requires:
   Dancer::Plugin::DBIC: 0.2001
   Dancer::Plugin::Passphrase: 2.0.1
   File::ShareDir: 1.03
+  File::Slurp: 9999.19
   Guard: 1.022
   HTML::Parser: 3.7
   HTTP::Tiny: 0.029
@@ -43,6 +44,7 @@ requires:
   List::MoreUtils: 0.33
   MCE: 1.408
   MIME::Base64: 3.13
+  Module::Load: 0.32
   Moo: 1.001
   Net::DNS: 0.72
   Net::Domain: 1.23
@@ -78,4 +80,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.027004
+version: 2.027005_001
diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm
index f4b25b5e..c07f0f4e 100644
--- a/Netdisco/lib/App/Netdisco.pm
+++ b/Netdisco/lib/App/Netdisco.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.027004';
+our $VERSION = '2.027005_001';
 use App::Netdisco::Configuration;
 
 =head1 NAME