lp:~logan/ubuntu/quantal/munin/debian-merge
- Get this branch:
- bzr branch lp:~logan/ubuntu/quantal/munin/debian-merge
Branch merges
- Jamie Strandboge: Approve
- Ubuntu branches: Pending requested
-
Diff: 2138 lines (+1802/-22)41 files modifiedChangeLog (+10/-0)
RELEASE (+1/-1)
debian/changelog (+20/-0)
debian/control (+1/-1)
debian/munin-async.init (+3/-3)
debian/munin-node.init (+2/-4)
debian/munin.init (+2/-4)
doc/.gitignore (+2/-0)
doc/Makefile (+153/-0)
doc/conf.py (+286/-0)
doc/documentation/index.rst (+11/-0)
doc/documentation/nomenclature.rst (+134/-0)
doc/example/index.rst (+14/-0)
doc/example/plugin/aggregate.rst (+188/-0)
doc/example/webserver/apache-virtualhost.rst (+65/-0)
doc/example/webserver/lighttpd.rst (+49/-0)
doc/example/webserver/nginx.rst (+72/-0)
doc/index.rst (+29/-0)
doc/installation/configuration.rst (+84/-0)
doc/installation/help.rst (+27/-0)
doc/installation/index.rst (+16/-0)
doc/installation/install.rst (+177/-0)
doc/installation/prerequisites.rst (+68/-0)
doc/installation/upgrade.rst (+19/-0)
doc/master/index.rst (+18/-0)
doc/master/munin-cron.rst (+14/-0)
doc/master/munin-html.rst (+13/-0)
doc/master/munin-limits.rst (+13/-0)
doc/master/munin-update.rst (+17/-0)
doc/master/rrdcached.rst (+116/-0)
doc/plugin/aggregate.rst (+8/-0)
doc/plugin/index.rst (+13/-0)
doc/plugin/reference.rst (+134/-0)
master/_bin/munin-cron.in (+5/-0)
master/_bin/munin-graph.in (+7/-2)
master/lib/Munin/Master/GraphOld.pm (+1/-1)
master/lib/Munin/Master/Node.pm (+3/-1)
plugins/lib/Munin/Plugin.pm (+3/-0)
plugins/node.d.linux/if_err_.in (+1/-1)
plugins/node.d/munin_stats.in (+0/-2)
plugins/plugin.sh.in (+3/-2)
Branch information
- Owner:
- Logan Rosen
- Status:
- Merged
Recent revisions
- 50. By Logan Rosen
-
* Merge from Debian unstable. Remaining changes:
- d/munin-node.upstart, munin.upstart: Add upstart configurations.
* New upstream version, reintroducing munin-graph (Closes: #681674) and
some bugfixes. The new munin book is added to the sources, but not yet
build.
* Add proper LSB headers to all init scripts. (Closes: #680223)
* debian/control: Rename "munin-async-*" to munin-async and munin-asyncd. - 49. By James Page
-
* Merge from Debian unstable. Remaining changes:
- d/munin-node.upstart, munin.upstart: Add upstart configurations. - 48. By James Page
-
* Resync with Debian unstable.
* d/munin-node.upstart, munin.upstart: Add upstart configurations. - 47. By Vibhav Pant
-
[ Vibhav Pant ]
* debian/patches/ upstream_ changeset_ 4597.patch:
- Fixes incorrect graph configuration in munin plugin
exim_mailqueue (LP: #598385).[ James Page ]
* debian/patches/ upstream_ changeset_ 4358.patch:
- Silent Perl 5.14 warnings to re-enable collection of
memory usage data in the memory plugin (LP: #1000678). - 45. By James Page
-
d/patches/
fix_iostat_ plugin. patch: Cherry picked patch from upstream
trunk to correct output of iostat plugin (LP: #919429). - 44. By Vibhav Pant
-
debian/
patches/ upstream_ changeset_ 4608.patch: use nfreeze() since it gets
stored in a file (LP: #872217) - 43. By Chuck Short
-
* Merge from Debian testing. Remaining changes:
- debian/rules: Remove sysvinit symlinks.
- debian/control: Add libwww-perl as a dependency.
- debian/rules, debian/munin-node. upstart. Convert to upstart.
- Fix sensors_fan for sensors output without minimum values
(LP: #840449).
- debian/patches/ lp_840449_ sensors_ fan_minimum_ is_optional. patch
Fix "mysql_ plugin fails when MySQL compiled without INNODB"
(LP: #757617)
- debian/patches/ upstream_ bug_884_ fixed_in_ trunk.patch
Fix munin_stats plugin: missing newline in "config"
(LP: #830564).
- debian/patches/ upstream_ bug_937_ fixed_in_ trunk.patch
Fix postfix_mailvolume when logfile is missing
(LP: #800845). - 42. By Chuck Short
-
* Fix sensors_fan for sensors output without minimum values
(LP: #840449).
- debian/patches/ lp_840449_ sensors_ fan_minimum_ is_optional. patch
* Fix "mysql_ plugin fails when MySQL compiled without INNODB"
(LP: #757617)
- debian/patches/ upstream_ bug_884_ fixed_in_ trunk.patch
* Fix munin_stats plugin: missing newline in "config"
(LP: #830564).
- debian/patches/ upstream_ bug_937_ fixed_in_ trunk.patch
* Fix postfix_mailvolume when logfile is missing
(LP: #800845). - 41. By Chuck Short
-
* Merge from Debian testing. Remaining changes:
- debian/rules: Remove sysvinit symlinks.
- debian/control: Add libwww-perl as a dependency.
- debian/rules, debian/munin-node. upstart. Convert to upstart
- debian/patches/ upstream_ add-timeout- to-legal- options. patch
- debian/patches/ upstream_ bug_832. patch
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/quantal/munin