slapos.git
3 years agoMerge branch 'master' into 1.0 1.0.10
Alain Takoudjou [Tue, 18 Aug 2015 09:17:46 +0000 (11:17 +0200)]
Merge branch 'master' into 1.0

3 years agouse slapos.cookbook 1.0.9
Alain Takoudjou [Tue, 18 Aug 2015 09:16:30 +0000 (11:16 +0200)]
use slapos.cookbook 1.0.9

3 years agoRelease 1.0.9 1.0.9
Rafael Monnerat [Mon, 17 Aug 2015 17:20:19 +0000 (19:20 +0200)]
Release 1.0.9

3 years agoMerge branch 'master' into '1.0'
Rafael Monnerat [Mon, 17 Aug 2015 17:19:28 +0000 (19:19 +0200)]
Merge branch 'master' into '1.0'

Update development version

See merge request !15

3 years agoUpdate development version
Rafael Monnerat [Mon, 17 Aug 2015 17:14:31 +0000 (19:14 +0200)]
Update development version

3 years agoMerge branch 'master' into '1.0'
Rafael Monnerat [Mon, 17 Aug 2015 17:10:09 +0000 (19:10 +0200)]
Merge branch 'master' into '1.0'

Master

Release Candidate

See merge request !14

3 years agoMerge remote-tracking branch 'lab/master'
Alain Takoudjou [Mon, 17 Aug 2015 16:46:11 +0000 (18:46 +0200)]
Merge remote-tracking branch 'lab/master'

3 years agoMerge branch 'kvm-cluster'
Alain Takoudjou [Mon, 17 Aug 2015 16:30:13 +0000 (18:30 +0200)]
Merge branch 'kvm-cluster'

3 years agoadd parameters to stop/start VM in cluster and enable vhost usage. Increase memory...
Alain Takoudjou [Mon, 17 Aug 2015 16:18:50 +0000 (18:18 +0200)]
add parameters to stop/start VM in cluster and enable vhost usage. Increase memory limit to
90Gb

3 years agomonitor sr: Drop smartctl implementation at the software release
Rafael Monnerat [Mon, 17 Aug 2015 15:45:05 +0000 (15:45 +0000)]
monitor sr: Drop smartctl implementation at the software release

 smartctl requires root, so it may never work. The appropriated way is run by another mean and only read the reports via Computer Partition

3 years agoslapos.toolbox: Version up and include pycurl.
Rafael Monnerat [Mon, 17 Aug 2015 14:39:25 +0000 (14:39 +0000)]
slapos.toolbox: Version up and include pycurl.

3 years agoRevert "Disable fluentd due to really bad rubygems."
Kirill Smelkov [Mon, 17 Aug 2015 13:27:03 +0000 (16:27 +0300)]
Revert "Disable fluentd due to really bad  rubygems."

This reverts commit 8dac482323f1f42a640f61f67337799f7ce99f10.

Let's try buildint again after hopefully fixing rubygems issue in
1f9adc65 (*: Pin rubygems library version when used; Do pinning by url)

/cc @klaus, @Tyagov

3 years ago*: Pin rubygems library version when used; Do pinning by url
Kirill Smelkov [Mon, 17 Aug 2015 12:52:23 +0000 (15:52 +0300)]
*: Pin rubygems library version when used; Do pinning by url

First of all, rubygemsrecipe tries to use latest rubygems library when
rubygems library version is not explicitly specified. So according to
slapos approach, that recipes are immutable, we should pin it.

For fluentd, Rafael already pinned rubygems library version to 2.4.8
(see b4fa5d31 "Pin fluentd version.").

However rubygemsrecipe tries to both find latest rubygems library
version, and to download rubygems when only version was specified from

    http://production.cf.rubygems.org/rubygems/

https://bitbucket.org/sirex/rubygemsrecipe/src/a37d4859a342b9250aeca8977ed565514a00fee4/rubygems.py?at=default#rubygems.py-126
https://bitbucket.org/sirex/rubygemsrecipe/src/a37d4859a342b9250aeca8977ed565514a00fee4/rubygems.py?at=default#rubygems.py-119

That site however no longer works and according to

    https://rubygems.org/pages/download

rubygems library tarballs are directly downloadable from

    https://rubygems.org/rubygems/...

So to make fluentd SR let's change pinning to work by full URL.

Also pin all other places which use rubygemsrecipe (only
software/unstable/gitrepo/software.cfg for now).

/trusted-by @rafael

3 years agoDisable fluentd due to really bad rubygems.
Ivan Tyagov [Mon, 17 Aug 2015 12:39:22 +0000 (15:39 +0300)]
Disable fluentd due to really bad  rubygems.

3 years agomonitor: Improve and fix monitor software release
Rafael Monnerat [Thu, 13 Aug 2015 18:08:16 +0000 (18:08 +0000)]
monitor: Improve and fix monitor software release

  Drop fluentd as the instalation is not working well
  Stop rsync logs and use symlink
  Clean up installation
  Make network bench use parameters instead of a static test list.

3 years agoPin fluentd version.
Rafael Monnerat [Thu, 13 Aug 2015 18:04:55 +0000 (18:04 +0000)]
Pin fluentd version.

3 years agoAccept frontend parameters to pass to the slave.
Rafael Monnerat [Wed, 12 Aug 2015 17:08:21 +0000 (17:08 +0000)]
Accept frontend parameters to pass to the slave.

3 years agokvm: Improve network speed by using virtio-net-pci device, allow to enable vhost-net
Alain Takoudjou [Fri, 7 Aug 2015 15:35:41 +0000 (17:35 +0200)]
kvm: Improve network speed by using virtio-net-pci device, allow to enable vhost-net

3 years agoMerge branch 'master' into 1.0 1.0.8.1
Alain Takoudjou [Thu, 6 Aug 2015 09:13:33 +0000 (11:13 +0200)]
Merge branch 'master' into 1.0

3 years agoMerge branch 'kvm-cluster'
Alain Takoudjou [Thu, 6 Aug 2015 09:08:18 +0000 (11:08 +0200)]
Merge branch 'kvm-cluster'

3 years agokvm: fix the check of use_nat parameter
Alain Takoudjou [Thu, 6 Aug 2015 09:04:55 +0000 (11:04 +0200)]
kvm: fix the check of use_nat parameter

3 years agomonitor: wait for dependencies files before start apache server
Alain Takoudjou [Thu, 6 Aug 2015 09:03:04 +0000 (11:03 +0200)]
monitor: wait for dependencies files before start apache server

3 years agokvm: fix the check of use_nat parameter
Alain Takoudjou [Thu, 6 Aug 2015 09:04:55 +0000 (11:04 +0200)]
kvm: fix the check of use_nat parameter

3 years agomonitor: wait for dependencies files before start apache server
Alain Takoudjou [Thu, 6 Aug 2015 09:03:04 +0000 (11:03 +0200)]
monitor: wait for dependencies files before start apache server

3 years agoMerge branch 'erp5-cluster'
Vincent Pelletier [Mon, 3 Aug 2015 14:47:50 +0000 (16:47 +0200)]
Merge branch 'erp5-cluster'

3 years agoerp5: Update TODO. erp5-cluster
Vincent Pelletier [Mon, 3 Aug 2015 14:10:17 +0000 (16:10 +0200)]
erp5: Update TODO.

3 years agowendelin: Teach -dev build to dump all threads traceback on SIGUSR1
Kirill Smelkov [Mon, 3 Aug 2015 08:21:28 +0000 (11:21 +0300)]
wendelin: Teach -dev build to dump all threads traceback on SIGUSR1

Via installing Products.signalstack

    https://pypi.python.org/pypi/Products.signalstack

/reviewed-by @Tyagov

3 years agoMerge branch 'master' into 1.0 1.0.8
Alain Takoudjou [Mon, 3 Aug 2015 07:44:49 +0000 (09:44 +0200)]
Merge branch 'master' into 1.0

3 years agoMerge branch 'kvm-cluster'
Alain Takoudjou [Mon, 3 Aug 2015 07:43:05 +0000 (09:43 +0200)]
Merge branch 'kvm-cluster'

3 years agokvm: make each network information acessible for VMs
Alain Takoudjou [Sun, 2 Aug 2015 19:08:03 +0000 (21:08 +0200)]
kvm: make each network information acessible for VMs

3 years agokvm: disable promise monitor slave frontend for now
Alain Takoudjou [Sun, 2 Aug 2015 16:19:58 +0000 (18:19 +0200)]
kvm: disable promise monitor slave frontend for now

3 years agokvm: fix monitor slave frontend software-type
Alain Takoudjou [Sun, 2 Aug 2015 14:19:16 +0000 (16:19 +0200)]
kvm: fix monitor slave frontend software-type

3 years agokvm: add monitor frontend, increase apache connexion limit
Alain Takoudjou [Sun, 2 Aug 2015 12:35:15 +0000 (14:35 +0200)]
kvm: add monitor frontend, increase apache connexion limit

3 years agokvm: add monitor stack
Alain Takoudjou [Sat, 1 Aug 2015 14:54:11 +0000 (16:54 +0200)]
kvm: add monitor stack

3 years agopycurl: pycurl component added
Tristan Cavelier [Fri, 13 Jun 2014 15:06:43 +0000 (15:06 +0000)]
pycurl: pycurl component added

3 years agokvm: add check Ansible task promises
Alain Takoudjou [Fri, 31 Jul 2015 17:27:08 +0000 (19:27 +0200)]
kvm: add check Ansible task promises

3 years agopublish-early: fix UnboundLocalError when there's nothing to do
Julien Muchembled [Fri, 31 Jul 2015 11:47:49 +0000 (13:47 +0200)]
publish-early: fix UnboundLocalError when there's nothing to do

3 years agoMerge branch 'master' into 1.0 1.0.7
Alain Takoudjou [Tue, 28 Jul 2015 15:39:34 +0000 (17:39 +0200)]
Merge branch 'master' into 1.0

3 years agoslaprunner: update md5sum
Alain Takoudjou [Tue, 28 Jul 2015 15:38:38 +0000 (17:38 +0200)]
slaprunner: update md5sum

3 years agoapache-frontend: 1.0.6 Merge branch 'master' into 1.0 1.0.6
Cédric Le Ninivin [Mon, 27 Jul 2015 13:09:22 +0000 (15:09 +0200)]
apache-frontend: 1.0.6 Merge branch 'master' into 1.0

3 years agoapache-frontend: update egg versions
Cédric Le Ninivin [Mon, 27 Jul 2015 13:03:52 +0000 (15:03 +0200)]
apache-frontend: update egg versions

3 years agoslaprunner fixup: remove deleted parts in resilient import profile
Alain Takoudjou [Fri, 24 Jul 2015 16:47:12 +0000 (18:47 +0200)]
slaprunner fixup: remove deleted parts in resilient import profile

3 years agoslaprunner fixup: remove deleted parts in resilient export profile
Alain Takoudjou [Fri, 24 Jul 2015 16:33:23 +0000 (18:33 +0200)]
slaprunner fixup: remove deleted parts in resilient export profile

3 years agoMerge branch 'master' into 1.0 1.0.5
Alain Takoudjou [Fri, 24 Jul 2015 12:13:56 +0000 (14:13 +0200)]
Merge branch 'master' into 1.0

3 years agouse slapos.cookbook 0.103
Alain Takoudjou [Fri, 24 Jul 2015 12:12:15 +0000 (14:12 +0200)]
use slapos.cookbook 0.103

3 years agoAdvertise development of new version
Alain Takoudjou [Fri, 24 Jul 2015 11:56:57 +0000 (13:56 +0200)]
Advertise development of new version

3 years agoRelease slapos.cookbook 0.103 slapos.cookbook-0.103
Alain Takoudjou [Fri, 24 Jul 2015 11:25:01 +0000 (13:25 +0200)]
Release slapos.cookbook 0.103

3 years agoslaprunner fixup: part check-recipe doesn't exist anymore
Alain Takoudjou [Fri, 24 Jul 2015 07:28:30 +0000 (09:28 +0200)]
slaprunner fixup: part check-recipe doesn't exist anymore

3 years agoMerge branch 'kvm-cluster'
Alain Takoudjou [Thu, 23 Jul 2015 14:31:06 +0000 (16:31 +0200)]
Merge branch 'kvm-cluster'

Conflicts:
software/kvm/common.cfg
software/wendelin/software.cfg

3 years agokvm-cluster: setup apache http server for sharing files with vms
Alain Takoudjou [Wed, 22 Jul 2015 13:27:02 +0000 (15:27 +0200)]
kvm-cluster: setup apache http server for sharing files with vms

3 years agokvm: fix kvm_run script, add qed in external disk format and improve http server
Alain Takoudjou [Thu, 16 Jul 2015 13:58:18 +0000 (15:58 +0200)]
kvm: fix kvm_run script, add qed in external disk format and improve http server

3 years agoslaprunner: include zip command
Jérome Perrin [Thu, 23 Jul 2015 09:21:11 +0000 (11:21 +0200)]
slaprunner: include zip command

3 years agofixup! slaprunner: fix 401 http errors when no account exist
Jérome Perrin [Thu, 23 Jul 2015 13:25:40 +0000 (15:25 +0200)]
fixup! slaprunner: fix 401 http errors when no account exist

Redirect in nginx does not behave the same depending on wether it is
accessed directly or behind apache proxy.

3 years agoMerge remote-tracking branch 'nexedi/master' into 1.0 1.0.4
Jérome Perrin [Tue, 21 Jul 2015 11:39:55 +0000 (13:39 +0200)]
Merge remote-tracking branch 'nexedi/master' into 1.0

3 years agoslaprunner: develop slapos.core & slapos.toolbox from gitlab slapos-0.271
Jérome Perrin [Mon, 20 Jul 2015 12:10:13 +0000 (14:10 +0200)]
slaprunner: develop slapos.core & slapos.toolbox from gitlab

3 years agoslaprunner: modernize develops
Jérome Perrin [Mon, 20 Jul 2015 12:08:28 +0000 (14:08 +0200)]
slaprunner: modernize develops

3 years agoslaprunner: improve shell
Jérome Perrin [Mon, 20 Jul 2015 12:00:24 +0000 (14:00 +0200)]
slaprunner: improve shell

- name wrapper bash, not sh as bash behave like sh when named sh
- add -l so that bash runs as login shell and reads .bash_profile
- enable colors in profile
- output a message in profile
- remaining TODOs: a working slapos node command

3 years agoslaprunner: allow to configure the window title by using 'instance-name' parameter
Jérome Perrin [Mon, 20 Jul 2015 12:27:25 +0000 (14:27 +0200)]
slaprunner: allow to configure the window title by using 'instance-name' parameter

This required slapos.toolbox 0.50

3 years agoslaprunner: make custom-frontend-promise an option.
Alain Takoudjou [Thu, 16 Jul 2015 14:19:59 +0000 (16:19 +0200)]
slaprunner: make custom-frontend-promise an option.

3 years agoslaprunner: fix 401 http errors when no account exist
Jérome Perrin [Mon, 20 Jul 2015 15:29:21 +0000 (17:29 +0200)]
slaprunner: fix 401 http errors when no account exist

If no htpasswd file exist, redirect to account creation page

3 years agoslaprunner: fix setting of $HOME
Jérome Perrin [Mon, 20 Jul 2015 15:26:02 +0000 (17:26 +0200)]
slaprunner: fix setting of $HOME

3 years agoslaprunner: Include /bin & /usr/bin in $PATH by default
Jérome Perrin [Mon, 20 Jul 2015 15:07:31 +0000 (17:07 +0200)]
slaprunner: Include /bin & /usr/bin in $PATH by default

This should not depend on the environment when executing slapos node
instance

3 years agoslaprunner: enable tig
Jérome Perrin [Fri, 1 May 2015 07:33:15 +0000 (07:33 +0000)]
slaprunner: enable tig

3 years agoadd tig component
Jérome Perrin [Fri, 1 May 2015 07:32:02 +0000 (07:32 +0000)]
add tig component

3 years agoslaprunner: use shellinabox from github
Jérome Perrin [Fri, 1 May 2015 07:31:24 +0000 (07:31 +0000)]
slaprunner: use shellinabox from github

Since shellinabox listen on AF_UNIX, we don't need another password for
shellinabox

3 years agoshellinabox: add parrallel version from https://github.com/shellinabox/shellinabox
Jérome Perrin [Mon, 20 Jul 2015 14:56:57 +0000 (16:56 +0200)]
shellinabox: add parrallel version from https://github.com/shellinabox/shellinabox

Interesting new features:
 * unix domain support
 * copy & paste with browser integration (Ctrl+C, Paste from browser in
 * popup)
 * warn before closing
 * fix bug when zooming from browser

For compatibility, the new shellinabox is named 'shellinabox-github'.
The previous component with ipv6 support is kept as 'shellinabox-2.10'
and is still the default when using 'shellinabox'

3 years agofixup! slaprunner: add configurable cpu-ratio parameter
Jérome Perrin [Mon, 20 Jul 2015 13:50:31 +0000 (15:50 +0200)]
fixup! slaprunner: add configurable cpu-ratio parameter

3 years agoslaprunner: remove outdated comment
Jérome Perrin [Fri, 1 May 2015 07:34:11 +0000 (07:34 +0000)]
slaprunner: remove outdated comment

3 years agoslaprunner: fix the typical french speaker mistake with informations
Jérome Perrin [Fri, 1 May 2015 07:00:34 +0000 (07:00 +0000)]
slaprunner: fix the typical french speaker mistake with informations

3 years agoadd POST method to simplehttpserver and support for access without hash url
Alain Takoudjou [Thu, 16 Jul 2015 13:47:37 +0000 (15:47 +0200)]
add POST method to simplehttpserver and support for access without hash url

3 years agoversion up eggs.
Kazuhiko Shiozaki [Sun, 19 Jul 2015 12:47:49 +0000 (21:47 +0900)]
version up eggs.

3 years agoversion up : R 3.2.1.
Kazuhiko Shiozaki [Sun, 19 Jul 2015 12:47:41 +0000 (21:47 +0900)]
version up : R 3.2.1.

3 years agoversion up : gettext 0.19.5.1.
Kazuhiko Shiozaki [Sun, 19 Jul 2015 12:47:30 +0000 (21:47 +0900)]
version up : gettext 0.19.5.1.

3 years agoversion up : gcc 5.2.0.
Kazuhiko Shiozaki [Sun, 19 Jul 2015 12:47:03 +0000 (21:47 +0900)]
version up : gcc 5.2.0.

3 years agoversion up eggs.
Kazuhiko Shiozaki [Wed, 8 Jul 2015 04:30:16 +0000 (13:30 +0900)]
version up eggs.

3 years agoversion up : lunzip 1.7.
Kazuhiko Shiozaki [Tue, 14 Jul 2015 10:44:37 +0000 (19:44 +0900)]
version up : lunzip 1.7.

3 years agoversion up : gettext 0.19.5.
Kazuhiko Shiozaki [Tue, 14 Jul 2015 10:44:28 +0000 (19:44 +0900)]
version up : gettext 0.19.5.

3 years agoversion up : setuptools 18.0.1.
Kazuhiko Shiozaki [Sun, 12 Jul 2015 14:16:02 +0000 (23:16 +0900)]
version up : setuptools 18.0.1.

3 years agoversion up: zc.buildout 1.7.1.post10
Julien Muchembled [Thu, 9 Jul 2015 16:06:58 +0000 (18:06 +0200)]
version up: zc.buildout 1.7.1.post10

3 years agoversion up eggs.
Kazuhiko Shiozaki [Wed, 8 Jul 2015 04:30:16 +0000 (13:30 +0900)]
version up eggs.

3 years agoERP5: prevent zope to start as long as the list of NEO master nodes is unknown
Julien Muchembled [Fri, 17 Jul 2015 19:01:11 +0000 (21:01 +0200)]
ERP5: prevent zope to start as long as the list of NEO master nodes is unknown

3 years agoPublished parameters as simple storage for generated passwords and NEO cluster name
Saurabh Bansod [Mon, 13 Jul 2015 12:25:00 +0000 (12:25 +0000)]
Published parameters as simple storage for generated passwords and NEO cluster name

For performance reasons, the root partition requests subpartitions during
initialization of sections, whereas such processing should normally be done
during the update/install phase.

The consequence is that partitions may be requested whereas they depend on
sections that fail (usually just temporarily, because of missing returned
parameters in the first runs).

For example, the request of zope partitions depends on the generation of
passwords:

1. password generated (__init__)
2. zope partitions requested (__init__)
3. password saved (install)

As long as a failure happens between 2 and 3, zope parameters are always
updated with a different password.

In the case of NEO, the instanciation of zope partitions currently succeeds even
if the list of master nodes is missing (note that there is a minor bug to fix
here: whenever a NEO storage is not the main one, zope processes may start too
early, and the user may have to restart zopes manually). The 'inituser_done'
file is created but zope processes fail to start if NEO is used as main storage,
and all this happens before the password was saved in the root partition
([neo-0-final] failing to install because 'admins' parameter returned yet).

This was never an issue with ZEO because zopes start successfully at the same
time the 'inituser_done' file is created.

One way to solve this could have been to introduce a dummy dependency between
[neo-0-final] and any other section generating a password. Quite ugly and we
also found non-optimal to use a non-backuped file in the root partition to save
such information, whereas we need anyway to publish them for the user.

Therefore, we introduce a new 'publish-early' recipe for accessing and
publishing desired parameters before any request of partitions. Of course,
these must not be dropped by the usual [publish] section, and to avoid having
to repeating them all manually, we have also added a '-extends' option to the
'publish' recipe.

We use the same technique to autogenerate and configure cluster name for NEO,
which helps us in minimizing the number of params one has to pass for
requesting NEO.

In the 'generate.password' recipe, the 'storage-path' can now be empty, when
there's no need to save the generated password in a file.

4 years agokvm: Kill duplicate text in README.txt
Kirill Smelkov [Fri, 17 Jul 2015 08:35:37 +0000 (11:35 +0300)]
kvm: Kill duplicate text in README.txt

Section "KVM instance (1GB of RAM, 10GB of SSD, one core)" was put there
twice with exactly the same text.

Remove duplicate.

/reviewed-by TrustMe
/cc @alain.takoudjou

4 years agoStart new NEO cluster automatically
Saurabh Bansod [Wed, 1 Jul 2015 10:15:04 +0000 (10:15 +0000)]
Start new NEO cluster automatically

4 years agoOpenBLAS: give instructions for Broadwell CPU
Sebastien Robin [Mon, 13 Jul 2015 15:49:07 +0000 (17:49 +0200)]
OpenBLAS: give instructions for Broadwell CPU

4 years agoerp5: activate deflate on apache
Romain Courteaud [Mon, 13 Jul 2015 09:05:00 +0000 (09:05 +0000)]
erp5: activate deflate on apache

4 years agoMerge remote-tracking branch 'origin/master' into erp5-cluster
Kazuhiko Shiozaki [Fri, 10 Jul 2015 02:15:40 +0000 (11:15 +0900)]
Merge remote-tracking branch 'origin/master' into erp5-cluster

4 years agofixup! version up : OpenSSL 1.0.2d.
Kazuhiko Shiozaki [Fri, 10 Jul 2015 02:14:37 +0000 (11:14 +0900)]
fixup! version up : OpenSSL 1.0.2d.

4 years agoMerge remote-tracking branch 'origin/master' into erp5-cluster
Kazuhiko Shiozaki [Fri, 10 Jul 2015 02:09:32 +0000 (11:09 +0900)]
Merge remote-tracking branch 'origin/master' into erp5-cluster

4 years agoversion up : OpenSSL 1.0.2d.
Kazuhiko Shiozaki [Thu, 9 Jul 2015 13:53:13 +0000 (22:53 +0900)]
version up : OpenSSL 1.0.2d.

4 years agoNEO: change default ports of admin & master nodes + option to change or disable
Julien Muchembled [Wed, 8 Jul 2015 09:33:36 +0000 (11:33 +0200)]
NEO: change default ports of admin & master nodes + option to change or disable

4 years agoMake it possible to instanciate 1 NEO DB inside an ERP5 instance
Saurabh Bansod [Thu, 2 Jul 2015 13:22:02 +0000 (13:22 +0000)]
Make it possible to instanciate 1 NEO DB inside an ERP5 instance

Before it was only possible to make an ERP5 cluster connect to a NEO cluster
that was instanciated separately, by passing "name" and "master_nodes"
connection parameters in "storage-dict".

For an internal NEO DB, "name" and "master_nodes" is filled automatically
and you must instead pass a "server" dict, with same parameters as in NEO SR.
Currently, a NEO cluster name must be given. Later, we hope to generate a good
name automatically.

All this was implemented by refactoring NEO & ERP5 SR, with common files.
For the ERP5 SR, the root partition also serves as "root" partition for NEO
partitions: in other words, there's no second empty partition.

4 years agoMerge branch 'master' into erp5-cluster
Julien Muchembled [Tue, 7 Jul 2015 15:57:07 +0000 (17:57 +0200)]
Merge branch 'master' into erp5-cluster

Dropped commit 971d0bb7d6fbb7e51fd8417386b7956d83597ccd
("erp5: Make possible extent the list of initial business templates to install").

Conflicts:
stack/erp5/buildout.cfg
stack/erp5/instance-erp5-cluster.cfg.in
stack/erp5/instance-erp5-single.cfg.in
stack/erp5/instance.cfg.in

4 years agofixup! libtool does not build anymore without m4
Julien Muchembled [Tue, 7 Jul 2015 18:49:53 +0000 (20:49 +0200)]
fixup! libtool does not build anymore without m4

4 years agolibtool does not build anymore without m4
Julien Muchembled [Tue, 7 Jul 2015 14:43:53 +0000 (16:43 +0200)]
libtool does not build anymore without m4

4 years agoversion up : HAProxy 1.5.14.
Kazuhiko Shiozaki [Sun, 5 Jul 2015 11:25:42 +0000 (20:25 +0900)]
version up : HAProxy 1.5.14.

4 years agoversion up : trafficserver 4.2.3.
Kazuhiko Shiozaki [Fri, 3 Jul 2015 08:53:07 +0000 (10:53 +0200)]
version up : trafficserver 4.2.3.

4 years agoERP5/NEO: fix a few errors in json schemas + some clean up
Julien Muchembled [Thu, 2 Jul 2015 18:46:46 +0000 (20:46 +0200)]
ERP5/NEO: fix a few errors in json schemas + some clean up

4 years agoerp5_cluster: leave ERP5 set the haproxy cookie
Cédric Le Ninivin [Tue, 26 May 2015 11:27:33 +0000 (13:27 +0200)]
erp5_cluster: leave ERP5 set the haproxy cookie

erp5-cluster: haproxy, move generic configuration into default section

4 years agoversion up eggs.
Kazuhiko Shiozaki [Thu, 2 Jul 2015 12:24:52 +0000 (14:24 +0200)]
version up eggs.