Merge branch 'master' into og-coreplugins

Changes

@@ -1,3 +1,9 @@
+2.036011 - 2017-10-09
+
+  [BUG FIXES]
+
+  * Shipping manifest
+
 2.036010 - 2017-10-08
 
   [ENHANCEMENTS]

MANIFEST

@@ -139,6 +139,7 @@ lib/App/Netdisco/Util/Permission.pm
 lib/App/Netdisco/Util/Port.pm
 lib/App/Netdisco/Util/PortMAC.pm
 lib/App/Netdisco/Util/SNMP.pm
+lib/App/Netdisco/Util/Statistics.pm
 lib/App/Netdisco/Util/Web.pm
 lib/App/Netdisco/Web.pm
 lib/App/Netdisco/Web/AdminTask.pm

META.json

@@ -101,7 +101,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.036010"
+         "version" : "2.036011"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -452,6 +452,9 @@
       "App::Netdisco::Util::SNMP" : {
          "file" : "lib/App/Netdisco/Util/SNMP.pm"
       },
+      "App::Netdisco::Util::Statistics" : {
+         "file" : "lib/App/Netdisco/Util/Statistics.pm"
+      },
       "App::Netdisco::Util::Web" : {
          "file" : "lib/App/Netdisco/Util/Web.pm"
       },
@@ -660,6 +663,6 @@
       "x_IRC" : "irc://irc.freenode.org/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.036010",
+   "version" : "2.036011",
    "x_serialization_backend" : "JSON::PP version 2.94"
 }

META.yml

@@ -18,7 +18,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.036010'
+    version: '2.036011'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -252,6 +252,8 @@ provides:
     file: lib/App/Netdisco/Util/PortMAC.pm
   App::Netdisco::Util::SNMP:
     file: lib/App/Netdisco/Util/SNMP.pm
+  App::Netdisco::Util::Statistics:
+    file: lib/App/Netdisco/Util/Statistics.pm
   App::Netdisco::Util::Web:
     file: lib/App/Netdisco/Util/Web.pm
   App::Netdisco::Web:
@@ -454,5 +456,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/bsd-license.php
   repository: https://github.com/netdisco/netdisco
-version: '2.036010'
+version: '2.036011'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

README.md

@@ -1,4 +1,34 @@
 # netdisco
-
 [![Build Status](https://travis-ci.org/netdisco/netdisco.svg?branch=master)](https://travis-ci.org/netdisco/netdisco)
 [![CPAN version](https://badge.fury.io/pl/App-Netdisco.svg)](https://metacpan.org/pod/App::Netdisco)
+
+## Description
+Netdisco is a web-based network management tool designed for network
+administrators. Data is collected into a PostgreSQL database using SNMP.
+
+Some of the things you can do with Netdisco:
+
+* Locate a machine on the network by MAC or IP and show the switch port it lives at
+* Turn off a switch port, or change the VLAN or PoE status of a port
+* Inventory your network hardware by model, vendor, software and operating system
+* Pretty pictures of your network
+
+App::Netdisco provides a web frontend with built-in web server, and a backend
+daemon to gather information from your network, and handle interactive
+requests such as changing port or device properties.
+
+## Startup
+Start the web-app server (accessible on port 5000)
+```bash
+~/bin/netdisco-web start
+```
+Start the daemon
+```bash
+netdisco$ ~/bin/netdisco-backend start
+```
+
+Main resource:
+ - [Main documentation on metacpan](https://metacpan.org/pod/App::Netdisco)
+ 
+Other resources:
+- [Github wiki](https://github.com/netdisco/netdisco/wiki)

lib/App/Netdisco.pm

@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.036010';
+our $VERSION = '2.036011';
 use App::Netdisco::Configuration;
 
 =head1 NAME