From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, next, updated. b0c682c06f9bbbbeaca98efc1d6f48afef1bbe1b
Date: Tue, 10 Jul 2012 13:27:05 +0200 [thread overview]
Message-ID: <20120710112705.6C9F7201C1@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 3090 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 b0c682c06f9bbbbeaca98efc1d6f48afef1bbe1b (commit)
via d487c74136841221cff3c9b04456fa044e9bf71c (commit)
from ace40c90eceaf77ed20ba39a45a2f883aaafa3fe (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 b0c682c06f9bbbbeaca98efc1d6f48afef1bbe1b
Merge: d487c74 ace40c9
Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
Date: Tue Jul 10 13:26:45 2012 +0200
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit d487c74136841221cff3c9b04456fa044e9bf71c
Author: Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
Date: Tue Jul 10 13:25:58 2012 +0200
core61: add updated files to updater.
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/61/filelists/files | 1 +
.../rootfiles/core/{54 => 61}/filelists/fireinfo | 0
config/rootfiles/core/{53 => 61}/filelists/openvpn | 0
config/rootfiles/core/61/filelists/pam | 1 +
4 files changed, 2 insertions(+), 0 deletions(-)
copy config/rootfiles/core/{54 => 61}/filelists/fireinfo (100%)
copy config/rootfiles/core/{53 => 61}/filelists/openvpn (100%)
create mode 120000 config/rootfiles/core/61/filelists/pam
Difference in files:
diff --git a/config/rootfiles/core/61/filelists/files b/config/rootfiles/core/61/filelists/files
index 56981ed..1624d83 100644
--- a/config/rootfiles/core/61/filelists/files
+++ b/config/rootfiles/core/61/filelists/files
@@ -4,6 +4,7 @@ etc/rc.d/init.d/collectd
opt/pakfire/lib/functions.sh
srv/web/ipfire/cgi-bin/index.cgi
srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
var/ipfire/general-functions.pl
var/ipfire/langs
usr/sbin/redirect_wrapper
diff --git a/config/rootfiles/core/61/filelists/fireinfo b/config/rootfiles/core/61/filelists/fireinfo
new file mode 120000
index 0000000..c461155
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/fireinfo
@@ -0,0 +1 @@
+../../../common/fireinfo
\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/openvpn b/config/rootfiles/core/61/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/61/filelists/pam b/config/rootfiles/core/61/filelists/pam
new file mode 120000
index 0000000..660a1d8
--- /dev/null
+++ b/config/rootfiles/core/61/filelists/pam
@@ -0,0 +1 @@
+../../../common/pam
\ No newline at end of file
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2012-07-10 11:27 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=20120710112705.6C9F7201C1@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