[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    kimheino pushed to munin (f28). "Merge remote-tracking branch 'origin/master' into el6"
From:       notifications () fedoraproject ! org
Date:       2018-08-24 19:48:13
Message-ID: 20180824194813.9D38E62D932A () bastion01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

Notification time stamped 2018-08-24 19:44:35 UTC

From 9c93010a020cad42b424a42e21a69b41b450801b Mon Sep 17 00:00:00 2001
From: D. Johnson <fenris02@fedoraproject.org>
Date: Feb 09 2013 22:17:23 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6


---

diff --git a/.gitignore b/.gitignore
index 15dd598..f36ad10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /munin-2.0.9.tar.gz
 /munin-2.0.10.tar.gz
 /munin-2.0.11.tar.gz
+/munin-2.0.11.1.tar.gz
diff --git a/munin-2.0-defect-1213.patch b/munin-2.0-defect-1213.patch
deleted file mode 100644
index 0246e32..0000000
--- a/munin-2.0-defect-1213.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru munin-2.0.7.orig/master/lib/Munin/Master/GraphOld.pm \
                munin-2.0.7/master/lib/Munin/Master/GraphOld.pm
---- munin-2.0.7.orig/master/lib/Munin/Master/GraphOld.pm	2012-10-02 \
                17:46:50.000000000 -0500
-+++ munin-2.0.7/master/lib/Munin/Master/GraphOld.pm	2012-10-19 20:12:24.600441211 \
                -0500
-@@ -842,6 +842,7 @@
- 
-         # This block does the real work.  Since we're forking exit
-         # afterwards.
-+        $running=0;
- 
-         &$work;
- 
-diff -ru munin-2.0.7.orig/master/lib/Munin/Master/HTMLOld.pm \
                munin-2.0.7/master/lib/Munin/Master/HTMLOld.pm
---- munin-2.0.7.orig/master/lib/Munin/Master/HTMLOld.pm	2012-10-02 \
                17:46:50.000000000 -0500
-+++ munin-2.0.7/master/lib/Munin/Master/HTMLOld.pm	2012-10-19 20:12:52.032172902 \
                -0500
-@@ -784,6 +784,7 @@
- 
-         # This block does the real work.  Since we're forking exit
-         # afterwards.
-+        $running=0;
- 
-         &$work;
- 
diff --git a/munin-2.0.11.1.tar.gz.sha256sum b/munin-2.0.11.1.tar.gz.sha256sum
new file mode 100644
index 0000000..7650175
--- /dev/null
+++ b/munin-2.0.11.1.tar.gz.sha256sum
@@ -0,0 +1 @@
+89ac6a46e82471206c37ed11a9fe2023cbf4c7482517f70a67d5aa5f32366c18  \
                munin-2.0.11.1.tar.gz
diff --git a/munin-2.0.11.tar.gz.sha256sum b/munin-2.0.11.tar.gz.sha256sum
deleted file mode 100644
index 661e18f..0000000
--- a/munin-2.0.11.tar.gz.sha256sum
+++ /dev/null
@@ -1 +0,0 @@
-c6365c981ab7f57f842aebd912b601cd6130eb0076391d217e2f5b26466a3935  \
                munin-2.0.11.tar.gz
diff --git a/sources b/sources
index d88b6b6..ef3f649 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3cb023e6e4ba4072159af11d932e4569  munin-2.0.11.tar.gz
+551109d4843764f00b39cf74b14fecf5  munin-2.0.11.1.tar.gz


	https://src.fedoraproject.org/rpms/munin/c/9c93010a020cad42b424a42e21a69b41b450801b?branch=f28
 _______________________________________________
scm-commits mailing list -- scm-commits@lists.fedoraproject.org
To unsubscribe send an email to scm-commits-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/scm-commits@lists.fedoraproject.org/message/I6HUBAJQ2WL725VIKMC75KM37PH3UR6G/



[prev in list] [next in list] [prev in thread] [next in thread]