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, 6.0 has been updated
via 40d8a4ef372ee3c0fa22a50c227db41990367f3a (commit)
via e74d0f3f3717754e87a0a0ed8acc308b03e09bf3 (commit)
from 5a3ff583e948659f3ce0b7437bc594e4c8ad73d7 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=40d8a4ef372ee3c0fa22a50c227db41990367f3a
commit 40d8a4ef372ee3c0fa22a50c227db41990367f3a
Author: Sylvain Beucler <[email protected]>
Date: Thu Nov 12 12:08:27 2015 +0100
testsuite: one more attempt to tame systemd
diff --git a/tests/func/fixtures.sh b/tests/func/fixtures.sh
index cb8f899..82ec7d6 100755
--- a/tests/func/fixtures.sh
+++ b/tests/func/fixtures.sh
@@ -141,8 +141,8 @@ fi
# Backup the DB, so that it can be restored for the test suite
if [ "$backup" = 1 ]; then
set -e
+ stop_apache --force || true # work-around systemd's "Job for
apache2.service canceled."
su - postgres -c 'psql -c CHECKPOINT' # flush to disk
- stop_apache --force
stop_database
rm -fr $pgdir.backup-$fixture/*
# support /var/lib/pgsql as a symlink to tmpfs
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=e74d0f3f3717754e87a0a0ed8acc308b03e09bf3
commit e74d0f3f3717754e87a0a0ed8acc308b03e09bf3
Author: Sylvain Beucler <[email protected]>
Date: Thu Nov 12 10:53:54 2015 +0100
Typo
diff --git a/src/CHANGES b/src/CHANGES
index ba1a2fb..8f151f6 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -35,7 +35,7 @@ FusionForge 6.0.2:
* FRS: do not display hidden releases publicly (TrivialDev & Inria)
* FRS: revert Notes and ChangeLog as optional fields - also when editing
releases (Inria)
* Tracker: fix column title in add/update custom field elements (TrivialDev)
-* Software Map: use "GNU/Linux" instead of "Linux" when refering to the OS
(Inria)
+* Software Map: use "GNU/Linux" instead of "Linux" when referring to the OS
(Inria)
* Snippets: allow forge administrator to delete snippets (Inria)
* Plugin Taskboard: fix logic on initialize error (TrivialDev)
* Plugin Taskboard: fix background column color setting (TrivialDev)
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 +-
tests/func/fixtures.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
