[munin/f17: 4/4] Merge remote-tracking branch 'origin/master' into f17
fenris02
fenris02 at fedoraproject.org
Sun Apr 28 17:47:49 UTC 2013
commit 5039e9fe109b36058b3f99e1bbc3f3d73aa2a5b1
Merge: 8da9616 4f306b1
Author: D. Johnson <fenris02 at fedoraproject.org>
Date: Sun Apr 28 12:47:39 2013 -0500
Merge remote-tracking branch 'origin/master' into f17
.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