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

Roland Mas lolando at fusionforge.org
Mon Dec 1 12:55:14 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  4f419a2e700529d02b9e36e87b7bee4880e5e9db (commit)
       via  ea04bb35611c0c9b2e8a5891b7e23d3de1f86600 (commit)
       via  d86342934ef88f8d0a433f06a8c74ceb20853c5b (commit)
       via  befada9a603fe329695c24463394c6a4fb6eaeb2 (commit)
       via  969f78f2ccaeb015734718e41b39062a35f286a1 (commit)
       via  9c1d9595f4728e7ec20eb010a907ed85bf93409f (commit)
       via  69be680409d4d6b1cd0fc4caeaab0eb638d8dc70 (commit)
       via  ab68e308da8b23dbf63f0477e66e4aa43e9145dd (commit)
       via  64ca2aefa13f7b84e374770c4c01622854daad01 (commit)
       via  17145ce85d427e94c047ba8391feb01cc3d4b3fd (commit)
       via  ac306673955a81988bb3de7fb8ae1351d5666fba (commit)
       via  ac3bf89c2b3a3eaaabcd0955cdc7a67ed689b7f5 (commit)
       via  5b9a6356565374d61d3b5ad8a77b7e62082a77a8 (commit)
       via  853979d1915c0fff4eb8577fd21cb07c571c5053 (commit)
       via  7c766dc6e778eb8424336276813cbde076dec424 (commit)
       via  6006ba00a1cbd11f81fa5545b914aa62695c7175 (commit)
       via  f7c41253e98aac4972246d3cfdb0739cd40547ab (commit)
      from  497c2c419031f1180e69aa69529778850fa192d0 (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 4f419a2e700529d02b9e36e87b7bee4880e5e9db
Merge: 497c2c4 ea04bb3
Author: Roland Mas <lolando at debian.org>
Date:   Mon Dec 1 12:54:52 2014 +0100

    Merge branch 'master' into feature/concurrent-ssh-http-for-scm

diff --cc tests/func/Testing/SeleniumForge.php
index 5e7b469,7099d4a..2a8901c
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@@ -133,14 -132,9 +132,9 @@@ class FForge_SeleniumTestCase extends P
  	protected function reload_apache()
  	{
  		$this->runCommand("service apache2 reload > /dev/null 2>&1 || service httpd reload > /dev/null 2>&1");
 -		sleep (3); // Give it some time to become available again
 +		sleep (5); // Give it some time to become available again
  	}
  
- 	protected function reload_nscd()
- 	{
- 		$this->runCommand("(nscd -i passwd && nscd -i group) >/dev/null 2>&1 || true");
- 	}
- 
  	protected function init() {
  		$this->createAndGoto('ProjectA');
  	}

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

Summary of changes:
 src/CHANGES                                        |    7 +-
 src/common/docman/views/listfile.php               |    6 +-
 src/common/docman/views/listtrashfile.php          |    2 +-
 src/common/docman/views/pendingfiles.php           |    2 +-
 src/common/include/cron_utils.php                  |    8 +
 src/cronjobs/scm/create_scm_repos.php              |    3 +
 src/cronjobs/shell/homedirs.php                    |    3 +
 .../mediawiki/cronjobs/create-imagedirs.php        |    4 +
 tests/buildbot/README                              |    1 +
 tests/buildbot/config/README                       |    1 +
 tests/buildbot/config/atom330                      |   32 -
 tests/buildbot/config/build                        |   18 -
 tests/buildbot/config/christian                    |   18 -
 tests/buildbot/config/g-dellm65-1                  |   27 -
 tests/buildbot/config/g-quadri1                    |   28 -
 tests/buildbot/config/g-virtual05                  |   21 -
 tests/buildbot/config/vladimir                     |   26 -
 tests/buildbot/fusionforge-build-and-test.sh       |    6 +-
 tests/buildbot/lxc/Makefile                        |   95 +--
 tests/buildbot/lxc/README                          |  226 -------
 tests/buildbot/lxc/destroy                         |    9 -
 tests/buildbot/{config => lxc}/init-jenkins.sh     |    7 +-
 tests/buildbot/lxc/lxc-centos5                     |  634 --------------------
 tests/buildbot/lxc/lxc-centos6                     |  569 ------------------
 tests/buildbot/lxc/lxc-centos7                     |  571 ------------------
 tests/buildbot/lxc/lxc-debian6                     |  484 ---------------
 tests/buildbot/lxc/lxc-debian7                     |  485 ---------------
 tests/buildbot/lxc/lxc-debian8                     |  486 ---------------
 tests/buildbot/lxc/start                           |    6 -
 tests/buildbot/lxc/stop                            |    5 -
 tests/buildbot/openvz/Makefile                     |  196 ------
 tests/buildbot/openvz/README                       |   75 ---
 tests/buildbot/openvz/destroy                      |    3 -
 tests/buildbot/openvz/interfaces.sample            |   22 -
 tests/buildbot/openvz/local.christian              |    3 -
 tests/buildbot/openvz/local.christian.rinse.bpi    |   19 -
 tests/buildbot/openvz/local.christian.rinse.conf   |   84 ---
 tests/buildbot/openvz/local.g-dellm65-1            |    3 -
 tests/buildbot/openvz/local.g-t3500-cb             |    3 -
 tests/buildbot/openvz/local.g-virtual05            |    3 -
 tests/buildbot/openvz/local.g-virtual05.rinse.bpi  |   19 -
 tests/buildbot/openvz/local.g-virtual05.rinse.conf |   84 ---
 tests/buildbot/openvz/local.rinse.api              |   12 -
 tests/buildbot/openvz/start                        |   15 -
 tests/buildbot/openvz/stop                         |    5 -
 tests/func/40_SSH/sshTest.php                      |    1 -
 tests/func/50_PluginsScmBzr/bzrTest.php            |    1 -
 tests/func/50_PluginsScmGit/gitSSHTest.php         |    1 -
 tests/func/50_PluginsScmSvn/svnSSHTest.php         |    1 -
 tests/func/Testing/SeleniumForge.php               |    6 -
 50 files changed, 44 insertions(+), 4302 deletions(-)
 create mode 100644 tests/buildbot/README
 create mode 100644 tests/buildbot/config/README
 delete mode 100644 tests/buildbot/config/atom330
 delete mode 100644 tests/buildbot/config/build
 delete mode 100644 tests/buildbot/config/christian
 delete mode 100644 tests/buildbot/config/g-dellm65-1
 delete mode 100644 tests/buildbot/config/g-quadri1
 delete mode 100644 tests/buildbot/config/g-virtual05
 delete mode 100644 tests/buildbot/config/vladimir
 delete mode 100644 tests/buildbot/lxc/README
 delete mode 100755 tests/buildbot/lxc/destroy
 rename tests/buildbot/{config => lxc}/init-jenkins.sh (81%)
 delete mode 100755 tests/buildbot/lxc/lxc-centos5
 delete mode 100755 tests/buildbot/lxc/lxc-centos6
 delete mode 100644 tests/buildbot/lxc/lxc-centos7
 delete mode 100755 tests/buildbot/lxc/lxc-debian6
 delete mode 100644 tests/buildbot/lxc/lxc-debian7
 delete mode 100644 tests/buildbot/lxc/lxc-debian8
 delete mode 100755 tests/buildbot/lxc/start
 delete mode 100755 tests/buildbot/lxc/stop
 delete mode 100644 tests/buildbot/openvz/Makefile
 delete mode 100644 tests/buildbot/openvz/README
 delete mode 100755 tests/buildbot/openvz/destroy
 delete mode 100644 tests/buildbot/openvz/interfaces.sample
 delete mode 100644 tests/buildbot/openvz/local.christian
 delete mode 100755 tests/buildbot/openvz/local.christian.rinse.bpi
 delete mode 100644 tests/buildbot/openvz/local.christian.rinse.conf
 delete mode 100644 tests/buildbot/openvz/local.g-dellm65-1
 delete mode 100644 tests/buildbot/openvz/local.g-t3500-cb
 delete mode 100644 tests/buildbot/openvz/local.g-virtual05
 delete mode 100755 tests/buildbot/openvz/local.g-virtual05.rinse.bpi
 delete mode 100644 tests/buildbot/openvz/local.g-virtual05.rinse.conf
 delete mode 100755 tests/buildbot/openvz/local.rinse.api
 delete mode 100755 tests/buildbot/openvz/start
 delete mode 100755 tests/buildbot/openvz/stop


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list