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

author	Gabriel Monnerat <gabriel@tiolive.com>
	Fri, 8 Jul 2011 18:37:13 +0000 (15:37 -0300)
committer	Gabriel Monnerat <gabriel@tiolive.com>
	Fri, 8 Jul 2011 18:37:13 +0000 (15:37 -0300)
commit	e500286650fa26c1203ee886dff4f412e629b6fb
tree	31f8d0b745ed94c7dabb391e85e8a19f6ffec785	tree \| snapshot
parent	a09e427c7cd2b8e971b3b7bb21819ef154e9327f	commit \| diff

merge 'master' into apache

124 files changed:

.gitignore		diff \| blob \| blame \| history
00.Repository.Rules.txt	[deleted file]	blob \| blame \| history
CHANGES.txt		diff \| blob \| blame \| history
MANIFEST.in		diff \| blob \| blame \| history
component/apache-php/buildout.cfg	[new file with mode: 0644]	blob
component/apache/buildout.cfg		diff \| blob \| blame \| history
component/bison/buildout.cfg		diff \| blob \| blame \| history
component/coreutils/buildout.cfg		diff \| blob \| blame \| history
component/curl/buildout.cfg		diff \| blob \| blame \| history
component/cyrus-sasl/buildout.cfg		diff \| blob \| blame \| history
component/erp5/buildout.cfg	[deleted file]	blob \| blame \| history
component/fastjar/buildout.cfg		diff \| blob \| blame \| history
component/ffmpeg/buildout.cfg		diff \| blob \| blame \| history
component/file/buildout.cfg		diff \| blob \| blame \| history
component/flare/buildout.cfg		diff \| blob \| blame \| history
component/fontconfig/buildout.cfg		diff \| blob \| blame \| history
component/freetype/buildout.cfg		diff \| blob \| blame \| history
component/gcc/buildout.cfg		diff \| blob \| blame \| history
component/gettext/buildout.cfg		diff \| blob \| blame \| history
component/ghostscript/buildout.cfg		diff \| blob \| blame \| history
component/git/buildout.cfg		diff \| blob \| blame \| history
component/glib/buildout.cfg		diff \| blob \| blame \| history
component/graphviz/buildout.cfg		diff \| blob \| blame \| history
component/grep/buildout.cfg		diff \| blob \| blame \| history
component/imagemagick/buildout.cfg		diff \| blob \| blame \| history
component/jasper/buildout.cfg		diff \| blob \| blame \| history
component/kumo/buildout.cfg		diff \| blob \| blame \| history
component/libpng/buildout.cfg		diff \| blob \| blame \| history
component/libreoffice-bin/buildout.cfg		diff \| blob \| blame \| history
component/librsync/buildout.cfg		diff \| blob \| blame \| history
component/libtiff/buildout.cfg		diff \| blob \| blame \| history
component/libxml2/buildout.cfg		diff \| blob \| blame \| history
component/libxslt/buildout.cfg		diff \| blob \| blame \| history
component/logrotate/buildout.cfg		diff \| blob \| blame \| history
component/lxml-python/buildout.cfg		diff \| blob \| blame \| history
component/m4/buildout.cfg		diff \| blob \| blame \| history
component/mariadb/buildout.cfg		diff \| blob \| blame \| history
component/memcached/buildout.cfg		diff \| blob \| blame \| history
component/mysql-5.1/buildout.cfg		diff \| blob \| blame \| history
component/mysql-tritonn-5.0/buildout.cfg		diff \| blob \| blame \| history
component/neon/buildout.cfg		diff \| blob \| blame \| history
component/openldap/buildout.cfg		diff \| blob \| blame \| history
component/openssl/buildout.cfg		diff \| blob \| blame \| history
component/pdftk/buildout.cfg		diff \| blob \| blame \| history
component/perl-SGML-Parser-OpenSP/buildout.cfg		diff \| blob \| blame \| history
component/perl-XML-LibXML/buildout.cfg		diff \| blob \| blame \| history
component/perl/buildout.cfg		diff \| blob \| blame \| history
component/pkgconfig/buildout.cfg		diff \| blob \| blame \| history
component/poppler/buildout.cfg	[new file with mode: 0644]	blob
component/postfix/buildout.cfg		diff \| blob \| blame \| history
component/python-2.4/buildout.cfg		diff \| blob \| blame \| history
component/python-2.6/buildout.cfg		diff \| blob \| blame \| history
component/python-2.7/buildout.cfg		diff \| blob \| blame \| history
component/readline/buildout.cfg		diff \| blob \| blame \| history
component/serf/buildout.cfg		diff \| blob \| blame \| history
component/slapos/buildout.cfg		diff \| blob \| blame \| history
component/sphinx/buildout.cfg		diff \| blob \| blame \| history
component/sqlite3/buildout.cfg		diff \| blob \| blame \| history
component/stunnel/buildout.cfg		diff \| blob \| blame \| history
component/subversion/buildout.cfg		diff \| blob \| blame \| history
component/tesseract/buildout.cfg		diff \| blob \| blame \| history
component/tokyocabinet/buildout.cfg		diff \| blob \| blame \| history
component/varnish/buildout.cfg		diff \| blob \| blame \| history
component/w3m/buildout.cfg		diff \| blob \| blame \| history
component/w3m/w3m.gcc.forward.compat.patch	[new file with mode: 0644]	blob
component/xtrabackup/allow_force_ibbackup.patch	[new file with mode: 0644]	blob
component/xtrabackup/buildout.cfg		diff \| blob \| blame \| history
component/zabbix/buildout.cfg		diff \| blob \| blame \| history
setup.py		diff \| blob \| blame \| history
slapos/recipe/README.mysql.txt	[new file with mode: 0644]	blob
slapos/recipe/README.zabbixagent.txt	[new file with mode: 0644]	blob
slapos/recipe/cloudooo/__init__.py		diff \| blob \| blame \| history
slapos/recipe/erp5/__init__.py		diff \| blob \| blame \| history
slapos/recipe/erp5/erp5.py		diff \| blob \| blame \| history
slapos/recipe/erp5/template/my.cnf.in		diff \| blob \| blame \| history
slapos/recipe/erp5/template/site.zcml	[new file with mode: 0644]	blob
slapos/recipe/erp5testnode/SlapOSControler.py		diff \| blob \| blame \| history
slapos/recipe/erp5testnode/__init__.py		diff \| blob \| blame \| history
slapos/recipe/erp5testnode/testnode.py		diff \| blob \| blame \| history
slapos/recipe/kumofs/__init__.py		diff \| blob \| blame \| history
slapos/recipe/librecipe/__init__.py	[moved from slapos/recipe/librecipe.py with 100% similarity]	blob \| blame \| history
slapos/recipe/librecipe/execute.py	[moved from slapos/recipe/erp5/execute.py with 100% similarity]	blob \| blame \| history
slapos/recipe/memcached/__init__.py		diff \| blob \| blame \| history
slapos/recipe/mysql/__init__.py	[copied from slapos/recipe/kumofs/__init__.py with 63% similarity]	diff \| blob \| blame \| history
slapos/recipe/mysql/certificate_authority.py	[new file with mode: 0644]	blob
slapos/recipe/mysql/mysql.py	[new file with mode: 0644]	blob
slapos/recipe/mysql/template/initmysql.sql.in	[new file with mode: 0644]	blob
slapos/recipe/mysql/template/logrotate_entry.in	[new file with mode: 0644]	blob
slapos/recipe/mysql/template/my.cnf.in	[copied from slapos/recipe/erp5/template/my.cnf.in with 97% similarity]	diff \| blob \| blame \| history
slapos/recipe/mysql/template/openssl.cnf.ca.in	[new file with mode: 0644]	blob
slapos/recipe/mysql/template/stunnel.conf.in	[new file with mode: 0644]	blob
slapos/recipe/osoeslaptraining/__init__.py	[new file with mode: 0644]	blob
slapos/recipe/osoeslaptraining/apache.py	[new file with mode: 0644]	blob
slapos/recipe/osoeslaptraining/mysql.py	[new file with mode: 0644]	blob
slapos/recipe/osoeslaptraining/template/apache.in	[new file with mode: 0644]	blob
slapos/recipe/osoeslaptraining/template/my.cnf.in	[copied from slapos/recipe/erp5/template/my.cnf.in with 100% similarity]	blob \| blame \| history
slapos/recipe/osoeslaptraining/template/mysqlinit.sql.in	[new file with mode: 0644]	blob
slapos/recipe/osoeslaptraining/template/php.ini.in	[new file with mode: 0644]	blob
slapos/recipe/vifib.py		diff \| blob \| blame \| history
slapos/recipe/zabbixagent/__init__.py	[new file with mode: 0644]	blob
slapos/recipe/zabbixagent/catdatefile.py	[new file with mode: 0644]	blob
slapos/recipe/zabbixagent/svcdaemon.py	[new file with mode: 0644]	blob
slapos/recipe/zabbixagent/template/logrotate_entry.in	[new file with mode: 0644]	blob
slapos/recipe/zabbixagent/template/zabbix_agentd.conf.in	[new file with mode: 0644]	blob
software/erp5/configuration.json	[new file with mode: 0644]	blob
software/erp5/instance.cfg		diff \| blob \| blame \| history
software/erp5/software.cfg		diff \| blob \| blame \| history
software/erp5testnode/software.cfg		diff \| blob \| blame \| history
software/kumofs/software.cfg		diff \| blob \| blame \| history
software/mariadb/instance.cfg	[new file with mode: 0644]	blob
software/mariadb/software.cfg	[copied from software/memcached/software.cfg with 73% similarity]	diff \| blob \| blame \| history
software/memcached/software.cfg		diff \| blob \| blame \| history
software/mysql-5.1/instance.cfg	[new file with mode: 0644]	blob
software/mysql-5.1/software.cfg	[copied from software/memcached/software.cfg with 73% similarity]	diff \| blob \| blame \| history
software/phpmyadmin/instance.cfg	[new file with mode: 0644]	blob
software/phpmyadmin/phpmyadmin.inc.php.in	[new file with mode: 0644]	blob
software/phpmyadmin/software.cfg	[new file with mode: 0644]	blob
software/slaprunner/instance.cfg	[new file with mode: 0644]	blob
software/slaprunner/software.cfg	[new file with mode: 0644]	blob
software/vifib/software.cfg	[new file with mode: 0644]	blob
software/zabbix-agent/instance.cfg	[new file with mode: 0644]	blob
software/zabbix-agent/software.cfg	[new file with mode: 0644]	blob
stack/erp5.cfg		diff \| blob \| blame \| history
stack/flask.cfg		diff \| blob \| blame \| history

(lab) SlapOS recipes

RSS Atom