[munin/el5: 5/5] Merge remote-tracking branch 'origin/master' into el5
fenris02
fenris02 at fedoraproject.org
Sun Apr 28 17:47:15 UTC 2013
commit 9cd7fd94b4395718445599c5c5a13e3e17a974c1
Merge: b7c3d75 4f306b1
Author: D. Johnson <fenris02 at fedoraproject.org>
Date: Sun Apr 28 12:46:57 2013 -0500
Merge remote-tracking branch 'origin/master' into el5
.gitignore | 1 +
munin-2.0.12.tar.gz.sha256sum | 1 -
munin-2.0.13.tar.gz.sha256sum | 1 +
munin-fcgi-graph.rc | 56 ++++++++++++++++++++++++++
munin-fcgi-graph.service | 2 +-
munin-fcgi-html.rc | 56 ++++++++++++++++++++++++++
munin-fcgi-html.service | 2 +-
munin.spec | 86 ++++++++++++++++++++++++++++++++++------
nginx_munin.conf | 49 +++++++++++++++++++++++
sources | 2 +-
10 files changed, 239 insertions(+), 17 deletions(-)
---
More information about the scm-commits
mailing list