Merge branch 'master' into em-device-ports-json

This commit is contained in:
Oliver Gorwits
2014-08-17 21:01:05 +01:00
7 changed files with 21 additions and 4 deletions

View File

@@ -4,7 +4,7 @@ use strict;
use warnings;
use 5.010_000;
our $VERSION = '2.029004';
our $VERSION = '2.029005';
use App::Netdisco::Configuration;
use Module::Find ();

View File

@@ -69,12 +69,14 @@ ajax '/ajax/userlog' => require_login sub {
map {s/\[\]/<empty>/; $_}
map { $_->log }
grep { $_->status eq 'done' }
grep { defined }
@jobs
],
'error' => [
map {s/\[\]/<empty>/; $_}
map { $_->log }
grep { $_->status eq 'error' }
grep { defined }
@jobs
],
);