[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. 4a1177a820973c7848a4c861b94e31b347b9ca75

Roland Mas lolando at fusionforge.org
Fri Nov 21 22:16:42 CET 2014


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 "FusionForge".

The branch, feature/concurrent-ssh-http-for-scm has been updated
       via  4a1177a820973c7848a4c861b94e31b347b9ca75 (commit)
       via  6c0ddb6c8e7039c6d82432fbfd326f3ca7db66b9 (commit)
       via  cbfe08142e1cb7c44d437f91bebed5c30b641e7d (commit)
       via  bf280d8362264f263b2a45a28ea1b2f9196ed18d (commit)
       via  50b885cd216b395e4b175706786301748fe92a57 (commit)
       via  567dd1523f475003506bf43afa02bce71bb9b926 (commit)
       via  a8b451f132f7a0e892836f8cbd0139f077029312 (commit)
       via  a06a49fe471ff0e9d5febf101fc9b9fa3dab6f09 (commit)
       via  d5a101ea2f4a8a13309934cd5749f8e22ace154a (commit)
       via  685d9296d124479f8923162f3476c4e479e0c00b (commit)
      from  a7484c3828dc11fe5d2a469f264146d1cd178539 (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 4a1177a820973c7848a4c861b94e31b347b9ca75
Merge: a7484c3 6c0ddb6
Author: Roland Mas <lolando at debian.org>
Date:   Fri Nov 21 22:16:27 2014 +0100

    Merge branch 'master' into feature/concurrent-ssh-http-for-scm
    
    Conflicts:
    	autoinstall/install-src.sh

diff --cc autoinstall/install-src.sh
index 64fae64,1ed6eef..cc1a70b
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -30,11 -30,13 +30,14 @@@ if [ -e /etc/debian_version ]; the
      backports_deb
      apt-get update
      apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier \
 +	libapache2-mpm-itk \
- 	apache2 locales-all postgresql libnss-pgsql2 unscd \
- 	subversion libapache2-mod-svn augeas-tools viewvc git \
+ 	apache2 postgresql libnss-pgsql2 unscd \
+ 	subversion augeas-tools viewvc git \
  	mediawiki \
  	python-moinmoin libapache2-mod-wsgi python-psycopg2
+     if [ $(cat /etc/lsb-release | sed -n 's/DISTRIB_ID=//p') != 'Ubuntu' ]; then
+ 	apt-get install locales-all  # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
+     fi
  else
      yum install -y make tar
      backports_rpm

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

Summary of changes:
 autoinstall/build.sh             |   11 +++++++----
 autoinstall/install-src.sh       |    7 +++++--
 autoinstall/install.sh           |    5 ++++-
 src/debian/fusionforge-web.prerm |    1 +
 src/post-install.d/common/ini.sh |    4 +++-
 tests/func/db_reload.sh          |    8 ++++++--
 6 files changed, 26 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list