git.erp5.org Git - slapos.git/commit

author	Gabriel Monnerat <gabriel@tiolive.com>
	Wed, 13 Jul 2011 00:51:03 +0000 (21:51 -0300)
committer	Gabriel Monnerat <gabriel@tiolive.com>
	Wed, 13 Jul 2011 00:51:03 +0000 (21:51 -0300)
commit	c3454564af62544a397110d4438bb7bf95faf29c
tree	831e45569c79d51c4c7def1141ee1eed34daf802	tree \| snapshot
parent	d30385e41c721c183ffd4fe1004bba4f19a57c0e	commit \| diff

merge master into branch apache

22 files changed:

CHANGES.txt		diff \| blob \| blame \| history
component/logrotate/buildout.cfg		diff \| blob \| blame \| history
component/logrotate/logrotate-3.7.9-O_CLOEXEC.optional.patch	[new file with mode: 0644]	blob
component/slapos/buildout.cfg		diff \| blob \| blame \| history
component/w3m/buildout.cfg		diff \| blob \| blame \| history
setup.py		diff \| blob \| blame \| history
slapos/recipe/slaprunner/__init__.py		diff \| blob \| blame \| history
slapos/recipe/slaprunner/execute.py		diff \| blob \| blame \| history
software/erp5/software.cfg		diff \| blob \| blame \| history
software/kumofs/software.cfg		diff \| blob \| blame \| history
software/mariadb/software.cfg		diff \| blob \| blame \| history
software/memcached/software.cfg		diff \| blob \| blame \| history
software/mysql-5.1/software.cfg		diff \| blob \| blame \| history
software/phpmyadmin/software.cfg		diff \| blob \| blame \| history
software/slaprunner/instance.cfg		diff \| blob \| blame \| history
software/slaprunner/software.cfg		diff \| blob \| blame \| history
software/wordpress/instance.cfg	[new file with mode: 0644]	blob
software/wordpress/software.cfg	[new file with mode: 0644]	blob
software/wordpress/wp-config.php.in	[new file with mode: 0644]	blob
stack/erp5.cfg		diff \| blob \| blame \| history
stack/lamp.cfg	[new file with mode: 0644]	blob
stack/shacache-client.cfg	[new file with mode: 0644]	blob

(lab) SlapOS recipes