From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 32a5fec71c317aa47ad27abecd3a63bda513972b
Date: Mon, 13 Apr 2015 11:29:06 +0200 [thread overview]
Message-ID: <20150413092906.DBDF721AD0@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1852 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 32a5fec71c317aa47ad27abecd3a63bda513972b (commit)
via 39d435690fa0fa56886bc95a00f7eb01463b7b80 (commit)
from ad50a299c8717ffdd3a0ec02b0db40888f5d9e73 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 32a5fec71c317aa47ad27abecd3a63bda513972b
Merge: ad50a29 39d4356
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Apr 13 11:28:57 2015 +0200
Merge remote-tracking branch 'amarx/BUG10797' into next
commit 39d435690fa0fa56886bc95a00f7eb01463b7b80
Author: Alexander Marx <alexander.marx(a)ipfire.org>
Date: Mon Apr 13 08:36:00 2015 +0200
BUG10797: Fix addontable in services.cgi when using squid-accounting addon
When squid-accounting addon is installed, it shows up under services.cgi
as "squid" service which is wrong.
-----------------------------------------------------------------------
Summary of changes:
html/cgi-bin/services.cgi | 3 +++
1 file changed, 3 insertions(+)
Difference in files:
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 6bfa5bb..76bd9ed 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -188,6 +188,9 @@ END
# mdadm should not stopped with webif because this could crash the system
#
chomp($_);
+ if ( $_ eq 'squid' ) {
+ next;
+ }
if ( ($_ ne "alsa") && ($_ ne "mdadm") ) {
$lines++;
if ($lines % 2){
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2015-04-13 9:29 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150413092906.DBDF721AD0@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox