[Fusionforge-commits] FusionForge branch master updated. 97eb3eed692d94d06a5970f964ffc4286c339f42
Roland Mas
lolando at fusionforge.org
Wed May 28 10:44:31 CEST 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 97eb3eed692d94d06a5970f964ffc4286c339f42 (commit)
via 0e77837663c41574a5953f6f0ec264dc41bfe1cf (commit)
via ef30c905c0aa140346eaa1f7f09f6901e7f549bd (commit)
from b2b32e06198d0e1a29e06fccaffc6abfc934c8b6 (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 97eb3eed692d94d06a5970f964ffc4286c339f42
Merge: b2b32e0 0e77837
Author: Roland Mas <lolando at debian.org>
Date: Wed May 28 10:44:06 2014 +0200
Merge branch 'Branch_5_3'
diff --cc vm/Vagrantfile-sample
index 7574ddb,880f069..5cd8a0a
--- a/vm/Vagrantfile-sample
+++ b/vm/Vagrantfile-sample
@@@ -18,8 -17,9 +18,10 @@@ Vagrant.configure(VAGRANTFILE_API_VERSI
#config.vm.synced_folder "..", "/usr/src/fusionforge"
#config.vm.synced_folder "../src", "/usr/share/gforge"
+ # Display graphics window, useful for running the Selenium testsuite
config.vm.provider :virtualbox do |vb|
- vb.gui = true
+ vb.gui = true
+ #vb.memory = 512
+ #vb.customize ["modifyvm", :id, "--cpus", "1"]
end
end
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 1 +
src/cronjobs/mail/mailing_lists_create.php | 6 +++---
vm/Vagrantfile-sample | 4 +++-
3 files changed, 7 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list