Merge branch 'master' into og-autoload

This commit is contained in:
Oliver Gorwits
2014-07-02 09:23:31 +01:00
4 changed files with 5 additions and 4 deletions

View File

@@ -215,6 +215,7 @@ lib/App/Netdisco/Web/Search.pm
lib/App/Netdisco/Web/Static.pm lib/App/Netdisco/Web/Static.pm
lib/App/Netdisco/Web/Statistics.pm lib/App/Netdisco/Web/Statistics.pm
lib/App/Netdisco/Web/TypeAhead.pm lib/App/Netdisco/Web/TypeAhead.pm
lib/Dancer/Template/NetdiscoTemplateToolkit.pm
LICENCE LICENCE
Makefile.PL Makefile.PL
MANIFEST This list of files MANIFEST This list of files

View File

@@ -58,7 +58,7 @@ requires:
Plack: 1.0023 Plack: 1.0023
Plack::Middleware::Expires: 0.03 Plack::Middleware::Expires: 0.03
Role::Tiny: 1.002005 Role::Tiny: 1.002005
SNMP::Info: 3.16 SNMP::Info: 3.18
SQL::Translator: 0.11016 SQL::Translator: 0.11016
Socket6: 0.23 Socket6: 0.23
Starman: 0.4008 Starman: 0.4008
@@ -81,4 +81,4 @@ resources:
homepage: http://netdisco.org/ homepage: http://netdisco.org/
license: http://opensource.org/licenses/bsd-license.php license: http://opensource.org/licenses/bsd-license.php
repository: git://git.code.sf.net/p/netdisco/netdisco-ng repository: git://git.code.sf.net/p/netdisco/netdisco-ng
version: 2.027008_001 version: 2.028000

View File

@@ -45,7 +45,7 @@ requires 'Plack::Middleware::Expires' => 0.03;
requires 'Role::Tiny' => 1.002005; requires 'Role::Tiny' => 1.002005;
requires 'Socket6' => 0.23; requires 'Socket6' => 0.23;
requires 'Starman' => 0.4008; requires 'Starman' => 0.4008;
requires 'SNMP::Info' => 3.16; requires 'SNMP::Info' => 3.18;
requires 'SQL::Translator' => 0.11016; requires 'SQL::Translator' => 0.11016;
requires 'Template' => 2.24; requires 'Template' => 2.24;
requires 'Template::Plugin::CSV' => 0.04; requires 'Template::Plugin::CSV' => 0.04;

View File

@@ -66,7 +66,7 @@ You I<must> reconfigure. Old configuration will not be migrated.
The daemons can be started from init scripts, as root. They will drop back The daemons can be started from init scripts, as root. They will drop back
from the root user to C<netdisco> before opening logs. However a limitation is from the root user to C<netdisco> before opening logs. However a limitation is
that the web frontend might need to keep root status to bind to a specific that the web frontend might temporarily keep root status to bind to a specific
port (e.g. 80) - the logs will then be created as root user. Sorry about that. port (e.g. 80) - the logs will then be created as root user. Sorry about that.
You might also find when upgrading that previous logs were owned by root and You might also find when upgrading that previous logs were owned by root and