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 2cce1559f2da9b986a4288159478b1b999710457 (commit) via c0e8224d1c176a1df13db0a2a506c9cdea4058a8 (commit) from b8101c50ea58cc6a6bc76fe472826af7b7f33271 (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 2cce1559f2da9b986a4288159478b1b999710457 Merge: c0e8224 b8101c5 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 5 13:38:25 2014 +0100

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

commit c0e8224d1c176a1df13db0a2a506c9cdea4058a8 Author: Michael Tremer michael.tremer@ipfire.org Date: Wed Feb 5 13:15:31 2014 +0100

network-vlans: Provide a better configuation file.

As suggested by Bernhard Bitsch, #10470.

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

Summary of changes: config/cfgroot/ethernet-vlans | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)

Difference in files: diff --git a/config/cfgroot/ethernet-vlans b/config/cfgroot/ethernet-vlans index ae87bfe..88a38e3 100644 --- a/config/cfgroot/ethernet-vlans +++ b/config/cfgroot/ethernet-vlans @@ -1,9 +1,9 @@ -#GREEN_PARENT_DEV=eth0 -#GREEN_VLAN_ID=20 -#GREEN_MAC_ADDRESS=00:11:22:33:44:55 -#BLUE_PARENT_DEV=green0 -#BLUE_VLAN_ID=30 -#BLUE_MAC_ADDRESS=00:22:33:44:55:66 -#ORANGE_PARENT_DEV=green0 -#ORANGE_VLAN_ID=40 -#ORANGE_MAC_ADDRESS=00:33:44:55:66:77 +GREEN_PARENT_DEV= +GREEN_VLAN_ID= +GREEN_MAC_ADDRESS= +BLUE_PARENT_DEV= +BLUE_VLAN_ID= +BLUE_MAC_ADDRESS= +ORANGE_PARENT_DEV= +ORANGE_VLAN_ID= +ORANGE_MAC_ADDRESS=

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