Merge branch 'master' into og-pluggable-daemon

2014-04-28 22:35:53 +01:00
parent fdeeffcbe4 5fc62090e2
commit 44e6c49419
6 changed files with 36 additions and 15 deletions
--- 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.026001_003';
+our $VERSION = '2.026001_004';

 use App::Netdisco::Environment;
 use Dancer ':script';
@@ -24,7 +24,7 @@ if (ref {} eq ref setting('database')) {
    setting('plugins')->{DBIC}->{netdisco} ||= {
        dsn  => $dsn,
        user => $user,
-        pass => $pass,
+        password => $pass,
        options => {
            AutoCommit => 1,
            RaiseError => 1,