From d5193823d2080f7f555a47a89bf217d02c52c7b0 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Mon, 11 Mar 2019 18:02:34 +0000
Subject: [PATCH] revert some changes to allow simpler merging

---
 Changes                   | 49 ++++++++++++++++++++++++++++++++-------
 MANIFEST                  |  2 +-
 bin/netdisco-sshcollector | 13 -----------
 3 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/Changes b/Changes
index 54ef567f..4f29f214 100644
--- a/Changes
+++ b/Changes
@@ -1,15 +1,48 @@
-2.041000 - 2019-02-24
-
-  [ENHANCEMENTS]
-
-  * #490 use new checks for ports having phones
-  * #494 update Cisco ASA ssh collector (stromsoe)
-  * #510 store ifindex in Device Port Properties table (rc9000)
+2.040007 - 2019-03-06
 
   [BUG FIXES]
 
-  * #492 Port Control uses VLAN config check (inphobia)
+  * #521-redux Search Node Date Range not working (ollyg)
+
+2.040006 - 2019-03-04
+
+  [BUG FIXES]
+
+  * #527 update List::MoreUtils version requirement
+
+2.040005 - 2019-03-04
+
+  [BUG FIXES]
+
+  * #526 fix discover syntax bug
+
+2.040004 - 2019-03-03
+
+  [NEW FEATURES]
+
+  * #510 store ifindex in Device Port Properties table (rc9000)
+  * new discover_waps and discover_phones boolean settings (ollyg)
+
+  [ENHANCEMENTS]
+
+  * #428 Port-Channels now showing in netmap (ollyg)
+  * #490 use new LLDP capability checks for ports having phones (ollyg)
+  * #494 update Cisco ASA ssh collector (stromsoe)
+
+  [BUG FIXES]
+
+  * #492 Port Control incorrectly uses VLAN config check (inphobia)
   * #493 HTML tag fix (inphobia)
+  * #498 Map with VLAN filter omits unconnected devices (ollyg)
+  * #499 netdisco-do renumber reports wrong ip (inphobia)
+  * #500 no more duplicate entries in vlan filter (ollyg)
+  * #505 renumbering device missed a few tables (ollyg)
+  * #512 fix regression in phone/wap discovery exclusion (ollyg)
+  * #514 ipinventory report returns consistent data (inphobia)
+  * #520 make sure aggports have a master<->slave (ollyg)
+  * #521 Search Node Date Range not working (ollyg)
+  * #522 TypeAhead.pm can reference empty data (inphobia)
+  * fix bug showing no nodes when only one matches in netmap (ollyg)
 
 2.040003 - 2019-01-18
 
diff --git a/MANIFEST b/MANIFEST
index 14f66599..32b20851 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -109,7 +109,6 @@ lib/App/Netdisco/SSHCollector/Platform/IOSXR.pm
 lib/App/Netdisco/SSHCollector/Platform/Linux.pm
 lib/App/Netdisco/SSHCollector/Platform/NXOS.pm
 lib/App/Netdisco/SSHCollector/Platform/PaloAlto.pm
-lib/App/Netdisco/Transport/CLI.pm
 lib/App/Netdisco/Transport/SNMP.pm
 lib/App/Netdisco/Util/Device.pm
 lib/App/Netdisco/Util/DNS.pm
@@ -365,6 +364,7 @@ share/schema_versions/App-Netdisco-DB-5-6-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-50-51-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-51-52-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-52-53-PostgreSQL.sql
+share/schema_versions/App-Netdisco-DB-53-54-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-6-7-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-7-8-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-8-9-PostgreSQL.sql
diff --git a/bin/netdisco-sshcollector b/bin/netdisco-sshcollector
index 569d06e1..29c0e154 100755
--- a/bin/netdisco-sshcollector
+++ b/bin/netdisco-sshcollector
@@ -78,17 +78,13 @@ if ($opensshdebug){
     $Net::OpenSSH::debug = ~0;
 }
 
-
 MCE::Loop::init { chunk_size => 1, max_workers => $workers };
 my %stats;
 $stats{entry} = 0;
 
-deprecation_warning();
 exit main();
 
 sub main {
-
-
     my @input = @{ setting('sshcollector') };
 
     if ($device){
@@ -180,15 +176,6 @@ sub store_arpentries {
     }
 }
 
-sub deprecation_warning {
-    print "\n";
-    warning sprintf "DEPRECATION WARNING\n" .
-                    "This script and the sshcollector setting will be removed in a future release!\n".
-                    "See this document to migrate to the new sshcollector integrated into\n" .
-                    "regular netdisco-do/netdisco-daemon arpnip:\n" .
-                    "https://github.com/netdisco/netdisco/wiki/bin-sshcollector-deprecation\n\n";
-}
-
 =head1 NAME
 
 netdisco-sshcollector - Collect ARP data for Netdisco from devices without