[munin/f17: 4/4] Merge remote-tracking branch 'origin/master' into f17
Kevin Fenzi
kevin at fedoraproject.org
Sun Apr 15 20:35:42 UTC 2012
commit 302b710ee06b7c560ec2d5bb4201ea3c35184fed
Merge: a4bd967 227cee4
Author: Kevin Fenzi <kevin at scrye.com>
Date: Sun Apr 15 14:35:10 2012 -0600
Merge remote-tracking branch 'origin/master' into f17
Conflicts:
.gitignore
munin.spec
sources
.gitignore | 3 ++
munin-1.4.6.tar.gz.sha256sum | 1 -
munin-1.4.7.tar.gz.sha256sum | 1 +
munin-node.service | 1 -
munin-node.service-privatetmp | 12 +++++++++++
munin.spec | 42 +++++++++++++++++++++++++++++++++++-----
sources | 1 -
7 files changed, 52 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 84856dd,87dcb6d..c729fac
--- a/.gitignore
+++ b/.gitignore
@@@ -6,4 -6,3 +6,7 @@@ munin-1.4.5.tar.g
/munin-1.4.5-no-such-object.patch
/munin-1.4.6.tar.gz
/munin-1.4.7.tar.gz
++<<<<<<< HEAD
+/munin-1.4.7.tar.gz.sha256sum
++=======
++>>>>>>> origin/master
More information about the scm-commits
mailing list