[munin/el5: 5/5] Merge remote-tracking branch 'origin/master' into el5
fenris02
fenris02 at fedoraproject.org
Sun Oct 7 22:18:19 UTC 2012
commit 8bb1df963c70595a41a5e31084643a1d5df60971
Merge: b120933 53ba900
Author: D. Johnson <fenris02 at fedoraproject.org>
Date: Sun Oct 7 17:18:00 2012 -0500
Merge remote-tracking branch 'origin/master' into el5
.gitignore | 1 +
linux-init.d_munin-asyncd.in | 4 +-
munin-2.0.6-OS.pm.7f32c59.patch | 10 ---
munin-2.0.6.tar.gz.sha256sum | 1 -
munin-2.0.7-http_loadtime.patch | 11 ++++
munin-2.0.7.tar.gz.sha256sum | 1 +
munin-node.rc | 65 +++++++++++++++++++++
munin.cron.d | 7 ++
munin.spec | 121 +++++++++++++++++++++++++-------------
sources | 2 +-
10 files changed, 167 insertions(+), 56 deletions(-)
---
More information about the scm-commits
mailing list