From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. e0aad107b540d9b716218b6035de24a776ef6322
Date: Sat, 10 Oct 2020 11:49:18 +0000 [thread overview]
Message-ID: <4C7jsB1y5wz2xbk@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2821 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 e0aad107b540d9b716218b6035de24a776ef6322 (commit)
via a9f69cbf01cd306dbc20c5761eedcdd97bc492e8 (commit)
via 5e4126c33b8bb031a3358333d10cb03f8f377c9b (commit)
via d328c232d7df7bf3f8582388f428c47a92fab0c1 (commit)
from 5e4f76bb714fda3b87b0fe58663d3cc353200362 (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 e0aad107b540d9b716218b6035de24a776ef6322
Merge: 5e4f76bb7 a9f69cbf0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 10 11:49:07 2020 +0000
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/oldcore/151/update.sh | 3 +++
html/cgi-bin/credits.cgi | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/config/rootfiles/oldcore/151/update.sh b/config/rootfiles/oldcore/151/update.sh
index 16135b2ef..699528274 100644
--- a/config/rootfiles/oldcore/151/update.sh
+++ b/config/rootfiles/oldcore/151/update.sh
@@ -50,6 +50,9 @@ ldconfig
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
# Start services
/etc/init.d/sshd restart
if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index fe838157f..cc0b958ce 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -67,8 +67,8 @@ Christian Schmidt,
Alexander Marx,
Matthias Fischer,
Peter Müller,
-Erik Kapfer,
Jan Paul Tücking,
+Erik Kapfer,
Jonatan Schlag,
Dirk Wagner,
Marcel Lorenz,
@@ -82,10 +82,9 @@ Stephan Feddersen,
Timo Eissler,
Jan Lentfer,
Marcus Scholz,
-Stéphane Pautrel,
Ersan Yildirim,
Jörn-Ingo Weigert,
-Adolf Belka,
+Stéphane Pautrel,
Alexander Koch,
Wolfgang Apolinarski,
Alfred Haas,
@@ -97,11 +96,11 @@ Florian Bührle,
Bernhard Bitsch,
Justin Luth,
Michael Eitelwein,
+Adolf Belka,
Alex Koch,
Dominik Hassler,
Larsen,
Gabriel Rolland,
-Marcel Follert,
Tim FitzGeorge,
Anton D. Seliverstov,
Bernhard Bittner,
@@ -129,6 +128,7 @@ Julian McConnell,
Kay-Michael Köhler,
Kim Wölfel,
Logan Schmidt,
+Marcel Follert,
Markus Untersee,
Mathew McBride,
Nico Prenzel,
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2020-10-10 11:49 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=4C7jsB1y5wz2xbk@people01.haj.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