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@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@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