|
[-]
[+]
|
Changed |
munin.changes
|
|
|
|
[-]
[+]
|
Changed |
munin.spec
^
|
|
|
|
[-]
[+]
|
Changed |
munin-2.0.19.tar.bz2/ChangeLog
^
|
| @@ -1,5 +1,25 @@
-*- text -*-
+munin-2.0.19, 2013-12-07
+
+-------
+Summary
+-------
+
+Bugfix release, aimed at fixing 2 bugs for Debian 7.3.
+Thanks again to Christoph Biedl for both (reports & patchs)
+
+Closes: #1394, #1395
+
+------------------
+Detailed Changelog
+------------------
+
+Steve Schnepp:
+ master: fix failures on partial graph_order
+ master: lazy create PNG in cron
+
+
munin-2.0.18, 2013-11-12
-------
|
|
[-]
[+]
|
Changed |
munin-2.0.19.tar.bz2/RELEASE
^
|
| @@ -1 +1 @@
-2.0.18
+2.0.19
|
|
[-]
[+]
|
Changed |
munin-2.0.19.tar.bz2/master/_bin/munin-graph.in
^
|
| @@ -148,7 +148,7 @@
my $graph_ttl = $period{$scale} || 1;
my $graph_last_expires = $time - ($time % $graph_ttl);
- {
+ if ($pinpoint || ! -f $filename || (stat(_))[9] < $graph_last_expires) {
# Should generate it
my $scale_options;
if ($pinpoint) {
|
|
[-]
[+]
|
Changed |
munin-2.0.19.tar.bz2/master/lib/Munin/Master/Node.pm
^
|
| @@ -276,15 +276,28 @@
};
- local *push_graphorder = sub {
- my ($oldservice) = @_;
+ local *push_graphorder = sub {
+ my ($oldservice) = @_;
- push( @{$global_config->{$oldservice}},
- ['graph_order', join(' ', @graph_order)] )
- unless !@graph_order ||
- grep { $_->[0] eq 'graph_order' } @{$global_config->{$oldservice}};
- @graph_order = ( );
- };
+ # We always appends the field names in config order to any
+ # graph_order given.
+ # Note that this results in duplicates in the internal state
+ # for @graph_order but munin_get_field_order() will eliminate
+ # them before graphing.
+
+ if (@graph_order) {
+ foreach (@{$global_config->{$oldservice}}) {
+ if ( $_->[0] eq 'graph_order' ) {
+ # append to a given graph_order
+ $_->[1] .= join(' ', '', @graph_order);
+ @graph_order = ( );
+ return;
+ }
+ }
+ push @{$global_config->{$oldservice}}, ['graph_order', join(' ', @graph_order)];
+ }
+ @graph_order = ( );
+ };
DEBUG "[DEBUG] Now parsing config output from plugin $plugin on "
|
|
[-]
[+]
|
Changed |
munin-2.0.19.tar.bz2/plugins/plugins.history.in
^
|
| @@ -362,3 +362,5 @@
[2.0.15]
[2.0.16]
[2.0.17]
+[2.0.18]
+[2.0.19]
|
