diff --git a/Netdisco/Changes b/Netdisco/Changes index 232f5d8d..6404d954 100644 --- a/Netdisco/Changes +++ b/Netdisco/Changes @@ -1,4 +1,4 @@ -2.029008 +2.029008 - 2014-09-23 [ENHANCEMENTS] @@ -7,6 +7,7 @@ [BUG FIXES] * Add Dancer import to SSHCollector Platforms + * Add note to docs to workaround current Dancer/YAML::XS issue 2.029007 - 2014-09-12 diff --git a/Netdisco/MANIFEST b/Netdisco/MANIFEST index e1080c3c..ae36a85c 100644 --- a/Netdisco/MANIFEST +++ b/Netdisco/MANIFEST @@ -314,6 +314,7 @@ share/views/ajax/admintask/undiscoveredneighbors.tt share/views/ajax/admintask/undiscoveredneighbors_csv.tt share/views/ajax/admintask/userlog.tt share/views/ajax/admintask/users.tt +share/views/ajax/datatabledefaults.tt share/views/ajax/device/addresses.tt share/views/ajax/device/addresses_csv.tt share/views/ajax/device/details.tt diff --git a/Netdisco/META.yml b/Netdisco/META.yml index f593b944..3f9093b4 100644 --- a/Netdisco/META.yml +++ b/Netdisco/META.yml @@ -71,7 +71,6 @@ requires: Sereal: 0 Socket6: 0.23 Starman: 0.4008 - Sys::Proctitle: 0 Template: 2.24 Template::Plugin::CSV: 0.04 Template::Plugin::Number::Format: 1.02 @@ -91,4 +90,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.029007 +version: 2.029008 diff --git a/Netdisco/lib/App/Netdisco.pm b/Netdisco/lib/App/Netdisco.pm index 18b750fa..90e2e4e7 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.029007'; +our $VERSION = '2.029008'; use App::Netdisco::Configuration; use Module::Find (); @@ -123,6 +123,7 @@ install Netdisco and its dependencies into the C user's home area su - netdisco curl -L http://cpanmin.us/ | perl - --notest --local-lib ~/perl5 App::Netdisco + ~/bin/localenv cpanm --force https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Dancer-1.3126.tar.gz Link some of the newly installed apps into a handy location: @@ -198,6 +199,9 @@ Notes|App::Netdisco::Manual::ReleaseNotes>. Then, the process is as follows: # upgrade Netdisco ~/bin/localenv cpanm --notest App::Netdisco + # workaround for current upstream bug + ~/bin/localenv cpanm --force https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Dancer-1.3126.tar.gz + # apply database schema updates ~/bin/netdisco-deploy diff --git a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod index 5bb9fd94..18460a92 100644 --- a/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod +++ b/Netdisco/lib/App/Netdisco/Manual/ReleaseNotes.pod @@ -36,6 +36,15 @@ but they are backwards compatible. =back +=head1 2.029008 + +=head2 General Notices + +When upgrading you will encounter a current incompatibility between Netdisco +and one of its components. To work around this, issue the following command: + + ~/bin/localenv cpanm --force https://cpan.metacpan.org/authors/id/Y/YA/YANICK/Dancer-1.3126.tar.gz + =head1 2.029002 =head2 General Notices