Revert "merge erp5 branch into master"
authorGabriel Monnerat <gabriel@tiolive.com>
Mon, 26 Mar 2012 16:22:16 +0000 (13:22 -0300)
committerGabriel Monnerat <gabriel@tiolive.com>
Mon, 26 Mar 2012 16:22:16 +0000 (13:22 -0300)
commitdeb192054f331e0026d2ae1c4a22cb44d746b4b7
tree63e2ef869019c2e9b5937c5143f9d5ca9c1240e6
parent4e5f9c71b4b1093121b88162950e89cf8f57efaf
Revert "merge erp5 branch into master"

This reverts commit 1ea46ea8492ecb20a88f1eb131f19111d8f68ec4.

Don't use squash because in this way we will lost the history.
100 files changed:
MANIFEST.in
component/apache-php/buildout.cfg
component/apache/buildout.cfg
component/apache/mod_antiloris-apache-2.4.patch [deleted file]
component/aspell/buildout.cfg [deleted file]
component/automake/buildout.cfg
component/file/buildout.cfg
component/fontconfig/buildout.cfg
component/freetype/buildout.cfg
component/ghostscript/buildout.cfg
component/git/buildout.cfg
component/graphviz/buildout.cfg
component/groonga/buildout.cfg
component/haproxy/buildout.cfg
component/imagemagick/buildout.cfg
component/java/buildout.cfg
component/libjpeg/buildout.cfg
component/libpng/buildout.cfg
component/libreoffice-bin/buildout.cfg
component/libtiff/buildout.cfg
component/mariadb/buildout.cfg
component/openssl/buildout.cfg
component/openssl/openssl-exlibs.patch [deleted file]
component/percona-toolkit/buildout.cfg
component/poppler/buildout.cfg
component/python-2.6/buildout.cfg
component/python-2.7/buildout.cfg
component/readline/buildout.cfg
component/sphinx/buildout.cfg
component/tesseract/buildout.cfg
component/tomcat/buildout.cfg [deleted file]
component/wget/buildout.cfg [deleted file]
component/xorg/buildout.cfg
component/zlib/buildout.cfg
setup.py
slapos/recipe/apache_zope_backend/__init__.py
slapos/recipe/apache_zope_backend/template/apache.zope.conf.in
slapos/recipe/apache_zope_backend/template/snippet.ssl.ca.in [deleted file]
slapos/recipe/apache_zope_backend/template/snippet.ssl.in [deleted file]
slapos/recipe/certificate_authority/__init__.py
slapos/recipe/davstorage/template/httpd.conf.in
slapos/recipe/erp5/template/apache.zope.conf.in
slapos/recipe/erp5/template/mysql-init-function.sql.in [moved from slapos/recipe/generic_mysql/template/mysql-init-function.sql.in with 73% similarity]
slapos/recipe/erp5_bootstrap/__init__.py [deleted file]
slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in [deleted file]
slapos/recipe/erp5_promise/__init__.py [deleted file]
slapos/recipe/fontconfig/template/fontconfig.cfg.in
slapos/recipe/generate_erp5_tidstorage.py
slapos/recipe/generic_kumofs/__init__.py
slapos/recipe/generic_kumofs/template/kumo_gateway.in
slapos/recipe/generic_kumofs/template/kumo_manager.in
slapos/recipe/generic_kumofs/template/kumo_server.in
slapos/recipe/generic_memcached/__init__.py
slapos/recipe/generic_memcached/template/memcached.in
slapos/recipe/generic_mysql/__init__.py
slapos/recipe/generic_mysql/template/my.cnf.in
slapos/recipe/generic_varnish/__init__.py [deleted file]
slapos/recipe/generic_varnish/template/default.vcl.in [deleted file]
slapos/recipe/generic_varnish/template/varnishd.in [deleted file]
slapos/recipe/generic_varnish/template/varnishlog.in [deleted file]
slapos/recipe/generic_varnish/template/varnishlogd.in [deleted file]
slapos/recipe/generic_zope/__init__.py
slapos/recipe/generic_zope/template/zope.conf.in
slapos/recipe/generic_zope/template/zope.conf.promise.in [deleted file]
slapos/recipe/generic_zope_zeo_client/__init__.py
slapos/recipe/generic_zope_zeo_client/template/zope.conf.in
slapos/recipe/generic_zope_zeo_client/template/zope.conf.promise.in [deleted file]
slapos/recipe/generic_zope_zeo_client/template/zope.conf.tidstorage.in [deleted file]
slapos/recipe/generic_zope_zeo_client/template/zope.conf.timeserver.in
slapos/recipe/lamp/template/apache.in
slapos/recipe/lamp/template/my.cnf.in
slapos/recipe/logrotate.py
slapos/recipe/mkdirectory.py
slapos/recipe/mysql/template/my.cnf.in
slapos/recipe/pulse2/template/apache.in.in
slapos/recipe/request.py
slapos/recipe/symbolic_link.py
slapos/recipe/web_checker/__init__.py [deleted file]
slapos/recipe/web_checker/template/web_checker.cfg.in [deleted file]
slapos/recipe/xwiki/template/my.cnf.in
software/cloudooo/instance.cfg
software/cloudooo/software.cfg
software/erp5/instance-cloudooo.cfg
software/erp5/instance-erp5-development.cfg
software/erp5/instance-erp5-production.cfg
software/erp5/instance-kumofs.cfg
software/erp5/instance-mariadb.cfg
software/erp5/instance-memcached.cfg
software/erp5/instance-varnish.cfg [deleted file]
software/erp5/instance-zope.cfg
software/erp5/instance.cfg
software/erp5/snippet-backend.cfg
software/erp5/snippet-master.cfg
software/erp5/snippet-zope.cfg
software/erp5/software.cfg
software/erp5testnode/software.cfg
software/vifib/software.cfg
stack/cloudooo.cfg
stack/erp5.cfg
stack/tomcat.cfg