[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1

[git]

[-- Attachment #1: Type: text/plain, Size: 1779 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  3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1 (commit)
       via  65712deca2d3dc3d9f94b1434446a617f107403a (commit)
       via  ee29c0d7445918c7edd81b5dcfb46210e2451bff (commit)
      from  a421b8038b927529a4ed08c13539f74f66c18f9e (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 3d82ea0ab1b313506bb6daeabedc8c0e760fc7e1
Merge: a421b80 65712de
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Jun 2 09:47:01 2015 +0200

    Merge remote-tracking branch 'origin/master' into next

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

Summary of changes:
 lfs/postfix | 2 +-
 lfs/vsftpd  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/lfs/postfix b/lfs/postfix
index 77c6dd0..fd33253 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = "amavisd mysql"
 
diff --git a/lfs/vsftpd b/lfs/vsftpd
index f3e74a0..7284be9 100644
--- a/lfs/vsftpd
+++ b/lfs/vsftpd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = vsftpd
-PAK_VER    = 7
+PAK_VER    = 8
 
 DEPS       = ""
 


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