Skip to content

Commit

Permalink
release 2.12-3
Browse files Browse the repository at this point in the history
  • Loading branch information
sni committed Dec 20, 2016
1 parent 4819f42 commit e12984b
Show file tree
Hide file tree
Showing 16 changed files with 30 additions and 22 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ panorama_default_view
notes.txt
themes/themes-available/*/images/logos/*.png
.~ko-*-perllint~
root/thruk/javascript/all_in_one-2.12-2.js
plugins/plugins-available/panorama/root/all_in_one-2.12-2_panorama.js
themes/themes-available/Thruk/stylesheets/all_in_one-2.12-2.css
themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.12-2.css
root/thruk/javascript/all_in_one-2.12-3.js
plugins/plugins-available/panorama/root/all_in_one-2.12-3_panorama.js
themes/themes-available/Thruk/stylesheets/all_in_one-2.12-3.css
themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.12-3.css
test_hook.sh
panorama/*.tab
bp/*.tbp
Expand Down
3 changes: 2 additions & 1 deletion Changes
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
This file documents the revision history for the Monitoring Webinterface Thruk.

next:
2.12-3 Tue Dec 20 20:43:54 CET 2016
- fix js error on status page
- Config Tool:
- fix http backends when using lmd

Expand Down
16 changes: 8 additions & 8 deletions MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ plugins/plugins-available/mobile/root/jqm/images/ajax-loader.gif
plugins/plugins-available/mobile/root/jqm/jquery.mobile-1.4.5.min.css
plugins/plugins-available/mobile/root/jqm/jquery.mobile-1.4.5.min.js
plugins/plugins-available/mobile/root/jquery.mobile.router.min.js
plugins/plugins-available/mobile/root/mobile-2.12-2.css
plugins/plugins-available/mobile/root/mobile-2.12-2.js
plugins/plugins-available/mobile/root/mobile-2.12-3.css
plugins/plugins-available/mobile/root/mobile-2.12-3.js
plugins/plugins-available/mobile/routes
plugins/plugins-available/mobile/t/controller_mobile.t
plugins/plugins-available/mobile/t/templates_mobile.t
Expand Down Expand Up @@ -363,7 +363,7 @@ plugins/plugins-available/panorama/lib/Thruk/Utils/Panorama/Scripted.pm
plugins/plugins-available/panorama/lib/Thruk/Utils/PanoramaCpuStats.pm
plugins/plugins-available/panorama/preview.png
plugins/plugins-available/panorama/README
plugins/plugins-available/panorama/root/all_in_one-2.12-2_panorama.js
plugins/plugins-available/panorama/root/all_in_one-2.12-3_panorama.js
plugins/plugins-available/panorama/root/bigscreen.js
plugins/plugins-available/panorama/root/cleanextjs.sh
plugins/plugins-available/panorama/root/extjs-4.1.1/ext-all-debug.js
Expand Down Expand Up @@ -948,7 +948,7 @@ plugins/plugins-available/panorama/root/openlayer/theme/default/img/zoom-panel.p
plugins/plugins-available/panorama/root/openlayer/theme/default/style.css
plugins/plugins-available/panorama/root/openlayer/theme/default/style.mobile.css
plugins/plugins-available/panorama/root/OpenLayers-2.13.1.js
plugins/plugins-available/panorama/root/panorama-2.12-2.css
plugins/plugins-available/panorama/root/panorama-2.12-3.css
plugins/plugins-available/panorama/root/sprintf.js
plugins/plugins-available/panorama/root/ux/chart/series/KPIGauge.js
plugins/plugins-available/panorama/root/ux/form/ItemSelector.js
Expand Down Expand Up @@ -1071,7 +1071,7 @@ root/robots.txt
root/thruk/images/spacer.png
root/thruk/images/trendshost.png
root/thruk/images/trendssvc.png
root/thruk/javascript/all_in_one-2.12-2.js
root/thruk/javascript/all_in_one-2.12-3.js
root/thruk/javascript/cal/img/cool-bg-hard-inv.png
root/thruk/javascript/cal/img/cool-bg-hard.png
root/thruk/javascript/cal/img/cool-bg-inv.png
Expand Down Expand Up @@ -1120,7 +1120,7 @@ root/thruk/javascript/jstree-3.0.9/themes/default/style.min.css
root/thruk/javascript/jstree-3.0.9/themes/default/throbber.gif
root/thruk/javascript/overlib.js
root/thruk/javascript/strftime-min.js
root/thruk/javascript/thruk-2.12-2.js
root/thruk/javascript/thruk-2.12-3.js
root/thruk/media/critical.wav
root/thruk/media/ok.wav
root/thruk/media/unknown.wav
Expand Down Expand Up @@ -2504,8 +2504,8 @@ themes/themes-available/Thruk/images/waiting.gif
themes/themes-available/Thruk/images/wand.png
themes/themes-available/Thruk/images/warning.png
themes/themes-available/Thruk/images/yellow.gif
themes/themes-available/Thruk/stylesheets/all_in_one-2.12-2.css
themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.12-2.css
themes/themes-available/Thruk/stylesheets/all_in_one-2.12-3.css
themes/themes-available/Thruk/stylesheets/all_in_one_noframes-2.12-3.css
themes/themes-available/Thruk/stylesheets/Thruk.css
themes/themes-available/Thruk/stylesheets/thruk_global.css
themes/themes-available/Thruk/stylesheets/thruk_noframes.css
Expand Down
7 changes: 7 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
thruk (2.12-3) UNRELEASED; urgency=low

[ Thruk Development Team ]
* new upstream release

-- Sven Nierlein <sven.nierlein@consol.de> Tue, 20 Dec 2016 20:43:55 +0100

thruk (2.12-2) UNRELEASED; urgency=low

[ Thruk Development Team ]
Expand Down
2 changes: 1 addition & 1 deletion docs/manpages/thruk.3
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "thruk 3"
.TH thruk 3 "2016-11-28" "perl v5.20.2" "User Contributed Perl Documentation"
.TH thruk 3 "2016-12-20" "perl v5.20.2" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
Expand Down
4 changes: 2 additions & 2 deletions lib/Thruk/Config.pm
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ BEGIN {
our $VERSION = '2.12';

my $project_root = home('Thruk::Config');
my $branch = '2';
my $branch = '3';
my $gitbranch = get_git_name($project_root);
my $filebranch = $branch || 1;
if($branch) {
Expand All @@ -45,7 +45,7 @@ $ENV{'THRUK_SRC'} = 'UNKNOWN' unless defined $ENV{'THRUK_SRC'};
our %config = ('name' => 'Thruk',
'version' => $VERSION,
'branch' => $branch,
'released' => 'November 28, 2016',
'released' => 'December 20, 2016',
'compression_format' => 'gzip',
'ENCODING' => 'utf-8',
'image_path' => $project_root.'/root/thruk/images',
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion root/thruk/startup.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@



<link rel='stylesheet' type='text/css' href='themes/Thruk/stylesheets/all_in_one-2.12-2.css' />
<link rel='stylesheet' type='text/css' href='themes/Thruk/stylesheets/all_in_one-2.12-3.css' />



Expand Down
2 changes: 1 addition & 1 deletion script/nagexp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use strict;
use warnings;

our $VERSION = '2.12';
my $branch = '2';
my $branch = '3';

my $nagexp = Thruk::nagexp->new();
exit $nagexp->run();
Expand Down
2 changes: 1 addition & 1 deletion script/nagimp
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use strict;
use warnings;

our $VERSION = '2.12';
my $branch = '2';
my $branch = '3';

my $nagimp = Thruk::nagimp->new();
exit $nagimp->run();
Expand Down
2 changes: 1 addition & 1 deletion script/naglint
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use strict;
use warnings;

our $VERSION = '2.12';
my $branch = '2';
my $branch = '3';
$branch = Thruk::Config::get_git_name() unless $branch ne '';

my $naglint = Thruk::naglint->new();
Expand Down
2 changes: 1 addition & 1 deletion script/thruk
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ use warnings;
use Getopt::Long qw//;

our $VERSION = '2.12';
my $branch = '2';
my $branch = '3';

my $options = {
'verbose' => 1,
Expand Down
2 changes: 1 addition & 1 deletion support/thruk.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

Name: thruk
Version: 2.12
Release: 2
Release: 3
License: GPLv2+
Packager: Sven Nierlein <sven.nierlein@consol.de>
Vendor: Labs Consol
Expand Down

0 comments on commit e12984b

Please sign in to comment.