From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd
Date: Tue, 04 Feb 2014 12:56:08 +0100
Message-ID: <20140204115608.F067721069@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6712358573854508146=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============6712358573854508146==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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  8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd (commit)
       via  6d72ff77e1f58fc7f0d6d4122ed231c47c5cdf13 (commit)
      from  fe30713604357bf8e7d62aa7e0d4c39402699938 (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 8e27b3ca86497fc1843749dcfb1f3eecf5a6afbd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 4 12:55:33 2014 +0100

    core76: Sort exclude file alphabetically.

commit 6d72ff77e1f58fc7f0d6d4122ed231c47c5cdf13
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Feb 4 12:51:21 2014 +0100

    Never include rc.local or firewall.local in a core update.

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/76/exclude | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/76/exclude b/config/rootfiles/core/76/excl=
ude
index 321a931..a468d0a 100644
--- a/config/rootfiles/core/76/exclude
+++ b/config/rootfiles/core/76/exclude
@@ -1,17 +1,19 @@
-srv/web/ipfire/html/proxy.pac
 boot/config.txt
-etc/udev/rules.d/30-persistent-network.rules
 etc/collectd.custom
-etc/shadow
 etc/ipsec.conf
 etc/ipsec.secrets
 etc/ipsec.user.conf
 etc/ipsec.user.secrets
-var/log/cache
-var/updatecache
 etc/localtime
-var/ipfire/ovpn
+etc/shadow
 etc/ssh/ssh_config
 etc/ssh/sshd_config
 etc/ssl/openssl.cnf
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/ovpn
+var/log/cache
 var/state/dhcp/dhcpd.leases
+var/updatecache


hooks/post-receive
--
IPFire 2.x development tree

--===============6712358573854508146==--