[Fusionforge-commits] FusionForge branch master updated. 54b0be524f08f8d6b9e440e340789fca42be2dc5

Sylvain Beucler beuc-inria at fusionforge.org
Tue Nov 4 17:01:04 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, master has been updated
       via  54b0be524f08f8d6b9e440e340789fca42be2dc5 (commit)
       via  0e35a5848bb67a06a050eee7821512bcc86d8f9a (commit)
       via  c1e977858f0b8b84de16865017b7f59bedbcc30d (commit)
       via  a2294fc9e90eb180b8db2e4a159b4a004d608947 (commit)
       via  be921839a018987b855887edd7d69b6c46d1d9dd (commit)
      from  87a931238e10bb8598285caf3c2c17a7eba061a6 (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 54b0be524f08f8d6b9e440e340789fca42be2dc5
Merge: 87a9312 0e35a58
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Nov 4 16:58:53 2014 +0100

    Merge branch 'Branch_5_3'
    
    Conflicts:
    	src/packaging/control/000source
    	src/packaging/dirs/common
    	src/packaging/install/common
    	src/packaging/install/web-apache2
    	src/packaging/links/common
    	src/plugins/admssw/packaging/install/plugin-admssw
    	src/plugins/authcas/packaging/install/plugin-authcas
    	src/plugins/authhttpd/packaging/install/plugin-authhttpd
    	src/plugins/authldap/packaging/install/plugin-authldap
    	src/plugins/authopenid/packaging/install/plugin-authopenid
    	src/plugins/authwebid/packaging/install/plugin-authwebid
    	src/plugins/blocks/packaging/install/plugin-blocks
    	src/plugins/compactpreview/packaging/install/plugin-compactpreview
    	src/plugins/contribtracker/packaging/install/plugin-contribtracker
    	src/plugins/doaprdf/packaging/install/plugin-doaprdf
    	src/plugins/externalsearch/packaging/install/plugin-externalsearch
    	src/plugins/extsubproj/packaging/install/plugin-extsubproj
    	src/plugins/foafprofiles/packaging/install/plugin-foafprofiles
    	src/plugins/globaldashboard/packaging/install/plugin-globaldashboard
    	src/plugins/gravatar/packaging/install/plugin-gravatar
    	src/plugins/headermenu/packaging/install/plugin-headermenu
    	src/plugins/helloworld/packaging/install/plugin-helloworld
    	src/plugins/hudson/packaging/install/plugin-hudson
    	src/plugins/mantisbt/packaging/install/plugin-mantisbt
    	src/plugins/mediawiki/packaging/install/plugin-mediawiki
    	src/plugins/message/packaging/install/plugin-message
    	src/plugins/moinmoin/packaging/install/plugin-moinmoin
    	src/plugins/oauthconsumer/packaging/install/plugin-oauthconsumer
    	src/plugins/oauthprovider/packaging/install/plugin-oauthprovider
    	src/plugins/oslc/packaging/install/plugin-oslc
    	src/plugins/projectimport/packaging/install/plugin-projectimport
    	src/plugins/projectlabels/packaging/install/plugin-projectlabels
    	src/plugins/projects-hierarchy/packaging/install/plugin-projects-hierarchy
    	src/plugins/scmarch/packaging/install/plugin-scmarch
    	src/plugins/scmbzr/packaging/install/plugin-scmbzr
    	src/plugins/scmccase/packaging/install/plugin-scmccase
    	src/plugins/scmcvs/packaging/install/plugin-scmcvs
    	src/plugins/scmdarcs/packaging/install/plugin-scmdarcs
    	src/plugins/scmgit/packaging/install/plugin-scmgit
    	src/plugins/scmhg/packaging/install/plugin-scmhg
    	src/plugins/scmhook/packaging/install/plugin-scmhook
    	src/plugins/scmsvn/packaging/install/plugin-scmsvn
    	src/plugins/sysauthldap/packaging/install/plugin-sysauthldap
    	src/plugins/twitter/packaging/install/plugin-twitter

diff --cc src/plugins/sysauthldap/bin/install.sh
index 8826ac2,38f1adc..38f1adc
mode 100755,100644..100755
--- a/src/plugins/sysauthldap/bin/install.sh
+++ b/src/plugins/sysauthldap/bin/install.sh

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

Summary of changes:
 src/plugins/sysauthldap/bin/install.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list