Cédric de Saint Martin [Fri, 14 Dec 2012 10:43:47 +0000 (11:43 +0100)]
Merge branch 'erp5'
Conflicts related to URL changes:
component/imagemagick/buildout.cfg
component/libtiff/buildout.cfg
component/rpm2cpio/buildout.cfg
Jean-Baptiste Petre [Thu, 6 Dec 2012 11:15:38 +0000 (12:15 +0100)]
fixe md5 sugar-crm sofware
Jean-Baptiste Petre [Thu, 6 Dec 2012 11:12:06 +0000 (12:12 +0100)]
fixe md5 punbb software
Jean-Baptiste Petre [Wed, 5 Dec 2012 18:04:00 +0000 (19:04 +0100)]
fixe md5sum software dotclear
Jean-Baptiste Petre [Wed, 5 Dec 2012 17:28:57 +0000 (18:28 +0100)]
fixe md5sum dotclear
Jean-Baptiste Petre [Wed, 5 Dec 2012 17:14:41 +0000 (18:14 +0100)]
fixe md5sum phpnuke
Jean-Baptiste Petre [Wed, 5 Dec 2012 17:02:04 +0000 (18:02 +0100)]
fixe url phpmyadmin
Jean-Baptiste Petre [Wed, 5 Dec 2012 16:43:22 +0000 (17:43 +0100)]
fixe md5 prestashop
Sebastien Robin [Fri, 14 Dec 2012 08:58:49 +0000 (09:58 +0100)]
fixed md5sum of instance of erp5-util-testing
Cédric de Saint Martin [Thu, 13 Dec 2012 17:26:52 +0000 (18:26 +0100)]
Merge branch 'slaprunner'
Cédric de Saint Martin [Thu, 13 Dec 2012 17:18:46 +0000 (18:18 +0100)]
Merge branch 'agent'
Cédric de Saint Martin [Thu, 13 Dec 2012 15:18:33 +0000 (16:18 +0100)]
Merge branch 'lapp-resilient3'
Sebastien Robin [Thu, 13 Dec 2012 14:36:38 +0000 (15:36 +0100)]
add software to launch erp5-util tests
Cédric de Saint Martin [Thu, 13 Dec 2012 13:24:25 +0000 (14:24 +0100)]
Add pkg-config executable to mydumper
Cédric de Saint Martin [Thu, 13 Dec 2012 13:23:38 +0000 (14:23 +0100)]
Add alias section for pkgconfig
name is confusing at first.
Kazuhiko Shiozaki [Thu, 13 Dec 2012 09:11:09 +0000 (10:11 +0100)]
explicitly set rpath for bzip2 otherwise dmtx-utils might be linked to system bzip2.
Kazuhiko Shiozaki [Mon, 1 Oct 2012 09:34:30 +0000 (11:34 +0200)]
version up : libtiff 4.0.3.
Cédric de Saint Martin [Wed, 12 Dec 2012 18:14:27 +0000 (19:14 +0100)]
Add openssl headers to apache
Marco Mariani [Tue, 4 Dec 2012 11:48:36 +0000 (12:48 +0100)]
explicitly install slapos.cookbook
(cherry picked from commit
e154f063b3af4af1b144e2b58b33f6abd65bdaf7)
Gabriel Monnerat [Wed, 12 Dec 2012 12:41:01 +0000 (13:41 +0100)]
add OCR B font to erp5 and cloudooo environment
Gabriel Monnerat [Wed, 12 Dec 2012 11:44:43 +0000 (12:44 +0100)]
add OCR B font. version 0.2
Kazuhiko Shiozaki [Wed, 12 Dec 2012 12:42:11 +0000 (13:42 +0100)]
explicitly set rpath for zlib otherwise dmtx-utils might be linked to system zlib.
Kazuhiko Shiozaki [Wed, 12 Dec 2012 12:39:50 +0000 (13:39 +0100)]
explicitly set rpath for zlib otherwise librsvg might be linked to system zlib.
Kazuhiko Shiozaki [Wed, 12 Dec 2012 12:33:56 +0000 (13:33 +0100)]
explicitly set rpath for zlib otherwise libcroco might be linked to system zlib.
Kazuhiko Shiozaki [Thu, 27 Sep 2012 13:13:41 +0000 (15:13 +0200)]
add missing pkgconfig path.
Cédric de Saint Martin [Tue, 11 Dec 2012 19:50:36 +0000 (20:50 +0100)]
Revert "Don't install slapos-cookbook"
This reverts commit
8784f3fb52593ee7151b125a4d49aade101ff9bd.
Cédric de Saint Martin [Tue, 11 Dec 2012 18:23:07 +0000 (19:23 +0100)]
Rollback to buildout 010 because of bug in 011
Cédric de Saint Martin [Tue, 11 Dec 2012 16:38:48 +0000 (17:38 +0100)]
Sort entry points
Cédric de Saint Martin [Tue, 11 Dec 2012 16:38:01 +0000 (17:38 +0100)]
Sort profiles
Cédric de Saint Martin [Tue, 11 Dec 2012 16:35:44 +0000 (17:35 +0100)]
Add explicit lxml dependency
Cédric de Saint Martin [Tue, 11 Dec 2012 14:41:14 +0000 (15:41 +0100)]
Don't install slapos-cookbook
Cédric de Saint Martin [Tue, 4 Dec 2012 17:23:20 +0000 (18:23 +0100)]
Use buildout 011
Cédric de Saint Martin [Tue, 4 Dec 2012 15:55:00 +0000 (16:55 +0100)]
Format exception before printing it
Cédric de Saint Martin [Tue, 4 Dec 2012 12:06:54 +0000 (13:06 +0100)]
Legacy default software type is RootSoftwareInstance, not RootSoftwareType
Cédric de Saint Martin [Tue, 4 Dec 2012 12:06:15 +0000 (13:06 +0100)]
Update cloud9
Cédric de Saint Martin [Tue, 4 Dec 2012 12:05:36 +0000 (13:05 +0100)]
Merge branch 'master' into slaprunner
Marco Mariani [Tue, 4 Dec 2012 11:48:36 +0000 (12:48 +0100)]
explicitly install slapos.cookbook
Cédric de Saint Martin [Tue, 4 Dec 2012 09:45:32 +0000 (10:45 +0100)]
Merge branch 'lapp-resilient3'
Marco Mariani [Tue, 4 Dec 2012 09:15:16 +0000 (10:15 +0100)]
removed dead method
Marco Mariani [Tue, 4 Dec 2012 09:02:48 +0000 (10:02 +0100)]
removed empty root instance
Jean-Baptiste Petre [Mon, 19 Nov 2012 11:45:56 +0000 (12:45 +0100)]
upgrade md5 software prestashop
Cédric de Saint Martin [Fri, 19 Oct 2012 13:14:25 +0000 (15:14 +0200)]
Raise if software_type is not mapped.
Don't have unexpected behavior and silent this error. This is bad. Bad. Bad.
Cédric de Saint Martin [Thu, 4 Oct 2012 16:21:02 +0000 (18:21 +0200)]
Set rpath flags in slapos-testing
Marco Mariani [Mon, 3 Dec 2012 15:27:05 +0000 (16:27 +0100)]
use slapmonitor-xml in place of slapreport
Marco Mariani [Mon, 3 Dec 2012 13:14:25 +0000 (14:14 +0100)]
slapmonitor-xml recipe
Marco Mariani [Mon, 3 Dec 2012 11:18:25 +0000 (12:18 +0100)]
pass extra parameters through the wrapper
Marco Mariani [Mon, 3 Dec 2012 11:12:15 +0000 (12:12 +0100)]
pin meld egg
Cédric de Saint Martin [Mon, 3 Dec 2012 14:00:36 +0000 (15:00 +0100)]
Don't try to fetch params when request has failed
Cédric de Saint Martin [Mon, 3 Dec 2012 11:20:02 +0000 (12:20 +0100)]
RequestOptional won't raise, only log, if request goes wrong
Marco Mariani [Thu, 29 Nov 2012 14:02:02 +0000 (15:02 +0100)]
provide postgres .pid file for slapreport
Marco Mariani [Thu, 29 Nov 2012 12:41:59 +0000 (13:41 +0100)]
simplify slapreport recipe with createWrapper
Marco Mariani [Thu, 29 Nov 2012 12:12:21 +0000 (13:12 +0100)]
simplify slapmonitor recipe with createWrapper
Marco Mariani [Thu, 29 Nov 2012 11:54:34 +0000 (12:54 +0100)]
provide postgres .pid file
Marco Mariani [Thu, 29 Nov 2012 10:50:00 +0000 (11:50 +0100)]
parts +=
Marco Mariani [Wed, 28 Nov 2012 15:14:17 +0000 (16:14 +0100)]
corrected log message
Marco Mariani [Wed, 28 Nov 2012 15:03:53 +0000 (16:03 +0100)]
avoid hardcoded strings
Marco Mariani [Wed, 28 Nov 2012 12:38:28 +0000 (13:38 +0100)]
connect to postgres through stunnel
Marco Mariani [Wed, 28 Nov 2012 11:04:31 +0000 (12:04 +0100)]
bin/takeover script
Marco Mariani [Tue, 27 Nov 2012 14:02:47 +0000 (15:02 +0100)]
stop an instance when freezing it
Marco Mariani [Tue, 27 Nov 2012 12:08:29 +0000 (13:08 +0100)]
call dropbear with -y
Marco Mariani [Tue, 27 Nov 2012 10:06:58 +0000 (11:06 +0100)]
renamed dump file
Marco Mariani [Mon, 26 Nov 2012 16:04:03 +0000 (17:04 +0100)]
Merge remote-tracking branch 'origin/master' into lapp-resilient2
Marco Mariani [Mon, 26 Nov 2012 14:18:04 +0000 (15:18 +0100)]
use += to include rdiff-backup etc.
Marco Mariani [Mon, 26 Nov 2012 14:16:32 +0000 (15:16 +0100)]
backup postgres with custom format and no permission
Marco Mariani [Mon, 26 Nov 2012 11:02:29 +0000 (12:02 +0100)]
updated md5
Marco Mariani [Mon, 26 Nov 2012 11:02:01 +0000 (12:02 +0100)]
fixed backup path
Marco Mariani [Mon, 26 Nov 2012 10:11:30 +0000 (11:11 +0100)]
removed reference to unused section
Marco Mariani [Fri, 23 Nov 2012 17:21:47 +0000 (18:21 +0100)]
replaced slapos.cookbook:maarch.configuration with own egg
Marco Mariani [Fri, 23 Nov 2012 14:31:59 +0000 (15:31 +0100)]
removed dead reference to lamp.request
Marco Mariani [Fri, 23 Nov 2012 13:48:21 +0000 (14:48 +0100)]
publish ip parameter
Marco Mariani [Fri, 23 Nov 2012 12:51:06 +0000 (13:51 +0100)]
publishurl -> publish
Marco Mariani [Fri, 23 Nov 2012 12:48:42 +0000 (13:48 +0100)]
avoid using instance.getComputerId() which does not exist.
Marco Mariani [Thu, 22 Nov 2012 15:47:10 +0000 (16:47 +0100)]
Merge remote-tracking branch 'origin/resiliency_annotated' into lapp-resilient2
Marco Mariani [Thu, 22 Nov 2012 15:44:39 +0000 (16:44 +0100)]
some comments on wrappers
Marco Mariani [Wed, 21 Nov 2012 15:52:46 +0000 (16:52 +0100)]
Marco Mariani [Wed, 21 Nov 2012 15:52:19 +0000 (16:52 +0100)]
Merge remote-tracking branch 'origin/lapp-resilient2' into lapp-resilient2
Marco Mariani [Wed, 21 Nov 2012 15:36:24 +0000 (16:36 +0100)]
tempalte -> instance rename
Marco Mariani [Wed, 21 Nov 2012 15:14:21 +0000 (16:14 +0100)]
template -> instance rename
Marco Mariani [Wed, 21 Nov 2012 13:43:18 +0000 (14:43 +0100)]
Merge branch 'resiliency_annotated' into lapp-resilient2
Marco Mariani [Wed, 21 Nov 2012 13:41:06 +0000 (14:41 +0100)]
Merge remote-tracking branch 'origin/resiliency_annotated' into resiliency_annotated
Conflicts:
stack/lamp/buildout.cfg
Marco Mariani [Wed, 21 Nov 2012 13:39:26 +0000 (14:39 +0100)]
template -> instance rename
Cédric de Saint Martin [Wed, 21 Nov 2012 09:17:12 +0000 (09:17 +0000)]
Merge branch 'softwaretype_raise'
Cédric de Saint Martin [Wed, 21 Nov 2012 09:16:11 +0000 (09:16 +0000)]
Merge branch 'slapos-testing'
Marco Mariani [Tue, 20 Nov 2012 15:31:36 +0000 (16:31 +0100)]
fixed misnamed file
Marco Mariani [Tue, 20 Nov 2012 15:22:51 +0000 (16:22 +0100)]
manual port of changes on lapp-resilient over this new branch
Marco Mariani [Tue, 20 Nov 2012 11:00:32 +0000 (12:00 +0100)]
Merge branch 'lapp' into lapp-resilient2
Marco Mariani [Tue, 20 Nov 2012 10:59:14 +0000 (11:59 +0100)]
Merge remote-tracking branch 'origin/lapp' into lapp
Marco Mariani [Tue, 20 Nov 2012 10:56:48 +0000 (11:56 +0100)]
Merge branch 'resiliency_annotated' into lapp
Conflicts:
slapos/recipe/request.py
Marco Mariani [Tue, 20 Nov 2012 10:37:39 +0000 (11:37 +0100)]
Merge branch 'lapp' into lapp-resilient2
Marco Mariani [Tue, 20 Nov 2012 10:35:23 +0000 (11:35 +0100)]
check that bin:initdb exists
Marco Mariani [Tue, 20 Nov 2012 10:14:54 +0000 (11:14 +0100)]
Merge branch 'lapp' into lapp-resilient2
Marco Mariani [Tue, 20 Nov 2012 10:12:50 +0000 (11:12 +0100)]
template -> instance
Marco Mariani [Tue, 20 Nov 2012 09:59:37 +0000 (10:59 +0100)]
root instance for default software_type
Marco Mariani [Tue, 20 Nov 2012 09:40:09 +0000 (10:40 +0100)]
Merge remote-tracking branch 'origin/lapp' into lapp
Marco Mariani [Tue, 20 Nov 2012 09:39:01 +0000 (10:39 +0100)]
renamed template -> instance, etc.
Marco Mariani [Mon, 19 Nov 2012 16:35:43 +0000 (17:35 +0100)]
moved sections, comments
Marco Mariani [Mon, 19 Nov 2012 16:34:42 +0000 (17:34 +0100)]
comments to align inter-branch diffs
Marco Mariani [Mon, 19 Nov 2012 13:06:23 +0000 (14:06 +0100)]
new renaming logic
Jean-Baptiste Petre [Mon, 19 Nov 2012 11:45:56 +0000 (12:45 +0100)]
upgrade md5 software prestashop
Marco Mariani [Mon, 19 Nov 2012 09:31:26 +0000 (10:31 +0100)]
avoid busy loops, use threadsafe Queue
projects / slapos.git / log