merge master into branch apache
authorGabriel Monnerat <gabriel@tiolive.com>
Wed, 13 Jul 2011 00:51:03 +0000 (21:51 -0300)
committerGabriel Monnerat <gabriel@tiolive.com>
Wed, 13 Jul 2011 00:51:03 +0000 (21:51 -0300)
commitc3454564af62544a397110d4438bb7bf95faf29c
tree831e45569c79d51c4c7def1141ee1eed34daf802
parentd30385e41c721c183ffd4fe1004bba4f19a57c0e
merge master into branch apache
22 files changed:
CHANGES.txt
component/logrotate/buildout.cfg
component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch [new file with mode: 0644]
component/slapos/buildout.cfg
component/w3m/buildout.cfg
setup.py
slapos/recipe/slaprunner/__init__.py
slapos/recipe/slaprunner/execute.py
software/erp5/software.cfg
software/kumofs/software.cfg
software/mariadb/software.cfg
software/memcached/software.cfg
software/mysql-5.1/software.cfg
software/phpmyadmin/software.cfg
software/slaprunner/instance.cfg
software/slaprunner/software.cfg
software/wordpress/instance.cfg [new file with mode: 0644]
software/wordpress/software.cfg [new file with mode: 0644]
software/wordpress/wp-config.php.in [new file with mode: 0644]
stack/erp5.cfg
stack/lamp.cfg [new file with mode: 0644]
stack/shacache-client.cfg [new file with mode: 0644]