public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 0fc392d65d513df573573dec57ccf06af2c29a9f
@ 2013-11-20 20:44 git
  0 siblings, 0 replies; only message in thread
From: git @ 2013-11-20 20:44 UTC (permalink / raw)
  To: ipfire-scm

[-- Attachment #1: Type: text/plain, Size: 1998 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, fifteen has been updated
       via  0fc392d65d513df573573dec57ccf06af2c29a9f (commit)
       via  303b81f19c37636402d2e5f850cb683e051bbe10 (commit)
       via  d48c456fa24545b6d9b06049fcef57850f1e02dc (commit)
      from  5702b0cee557ec11ecda43a2482f72f212bffa84 (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 0fc392d65d513df573573dec57ccf06af2c29a9f
Merge: 5702b0c 303b81f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Nov 20 21:43:20 2013 +0100

    Merge branch 'master' into fifteen

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

Summary of changes:
 config/rootfiles/{oldcore/36 => core/73}/filelists/openssh | 0
 config/rootfiles/oldcore/73/update.sh                      | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 copy config/rootfiles/{oldcore/36 => core/73}/filelists/openssh (100%)

Difference in files:
diff --git a/config/rootfiles/core/73/filelists/openssh b/config/rootfiles/core/73/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/73/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/73/update.sh b/config/rootfiles/oldcore/73/update.sh
index ee799ad..a9fed1b 100644
--- a/config/rootfiles/oldcore/73/update.sh
+++ b/config/rootfiles/oldcore/73/update.sh
@@ -70,7 +70,7 @@ fi
 sync
 
 # This update need a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
 
 #
 #Finish


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

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-11-20 20:44 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-20 20:44 [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. 0fc392d65d513df573573dec57ccf06af2c29a9f git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox