merge master into erp5 branch
authorGabriel Monnerat <gabriel@tiolive.com>
Tue, 20 Mar 2012 15:31:54 +0000 (12:31 -0300)
committerGabriel Monnerat <gabriel@tiolive.com>
Tue, 20 Mar 2012 15:45:48 +0000 (12:45 -0300)
commitfd8020743cf2bd4ed59b8af4540e133b9b652352
treed3dde27bb029b7e1dd5b93cce9ce46f4e6b4b885
parentfd82b4c67cb7b5ec94c48310da383c78a7e5094a
merge master into erp5 branch
131 files changed:
CHANGES.txt
MANIFEST.in
component/alsa/buildout.cfg [new file with mode: 0644]
component/binutils/buildout.cfg [new file with mode: 0644]
component/boa/buildout.cfg [new file with mode: 0644]
component/busybox/buildout.cfg [new file with mode: 0644]
component/chromium/buildout.cfg [new file with mode: 0644]
component/cloudooo/buildout.cfg
component/dbus/buildout.cfg [new file with mode: 0644]
component/dropbear/buildout.cfg
component/dropbear/dropbear-0.53.1-static_build_fix.patch [new file with mode: 0644]
component/dropbear/no-shell-checking.patch [new file with mode: 0644]
component/dropbear/userspace.patch
component/firefox/buildout.cfg [new file with mode: 0644]
component/fontconfig/buildout.cfg
component/gtk-2/buildout.cfg [new file with mode: 0644]
component/intltool/buildout.cfg [new file with mode: 0644]
component/mesa/buildout.cfg [new file with mode: 0644]
component/mydumper/buildout.cfg [new file with mode: 0644]
component/mydumper/mydumper-remove-warnings-errors.patch [new file with mode: 0644]
component/opera/buildout.cfg [new file with mode: 0644]
component/perl-XML-Parser/buildout.cfg [new file with mode: 0644]
component/pwgen/buildout.cfg [new file with mode: 0644]
component/qt/buildout.cfg [new file with mode: 0644]
component/shellinabox/0001-Switch-to-IPv6.patch [new file with mode: 0644]
component/shellinabox/0002-Allow-to-run-entire-command-path.patch [new file with mode: 0644]
component/shellinabox/buildout.cfg [new file with mode: 0644]
component/slapos/buildout.cfg
component/xorg/buildout.cfg
setup.py
slapos/recipe/README.apache_frontend.txt [new file with mode: 0644]
slapos/recipe/README.helloworld.txt [deleted file]
slapos/recipe/README.seleniumrunner.txt [new file with mode: 0644]
slapos/recipe/_urlparse.py [copied from slapos/recipe/duplicity.py with 71% similarity]
slapos/recipe/apache_frontend/__init__.py [new file with mode: 0644]
slapos/recipe/apache_frontend/certificate_authority.py [copied from slapos/recipe/certificate_authority/certificate_authority.py with 87% similarity, mode: 0755]
slapos/recipe/apache_frontend/template/apache.conf.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/apache.conf.path-protected.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/apache.location-snippet.conf.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/logrotate_entry.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/notfound.html [new file with mode: 0644]
slapos/recipe/apache_frontend/template/openssl.cnf.ca.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/stunnel.conf.entry.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/stunnel.conf.in [new file with mode: 0644]
slapos/recipe/apache_frontend/template/varnish.vcl.in [new file with mode: 0644]
slapos/recipe/apachephp/__init__.py [new file with mode: 0644]
slapos/recipe/apachephp/template/apache.in [new file with mode: 0644]
slapos/recipe/apachephp/template/php.ini.in [new file with mode: 0644]
slapos/recipe/apacheproxy/__init__.py [copied from slapos/recipe/duplicity.py with 56% similarity]
slapos/recipe/apacheproxy/template/apache.in [new file with mode: 0644]
slapos/recipe/certificate_authority/__init__.py
slapos/recipe/certificate_authority/certificate_authority.py
slapos/recipe/davstorage/__init__.py
slapos/recipe/dropbear.py [new file with mode: 0644]
slapos/recipe/duplicity.py
slapos/recipe/equeue.py [copied from slapos/recipe/duplicity.py with 79% similarity]
slapos/recipe/erp5testnode/__init__.py
slapos/recipe/librecipe/__init__.py
slapos/recipe/librecipe/execute.py
slapos/recipe/librecipe/filehash.py [new file with mode: 0644]
slapos/recipe/librecipe/generic.py
slapos/recipe/librecipe/genericslap.py
slapos/recipe/librecipe/inotify.py [copied from slapos/recipe/duplicity.py with 66% similarity]
slapos/recipe/lockfile.py [new file with mode: 0644]
slapos/recipe/mydumper.py [new file with mode: 0644]
slapos/recipe/mysql/__init__.py
slapos/recipe/mysql/backup.py
slapos/recipe/mysql/catdatefile.py [deleted file]
slapos/recipe/mysql/recover.py [deleted file]
slapos/recipe/mysql/template/my.cnf.in
slapos/recipe/notifier.py [new file with mode: 0644]
slapos/recipe/pbs.py [new file with mode: 0644]
slapos/recipe/publish.py
slapos/recipe/publishurl.py
slapos/recipe/pulse2/__init__.py
slapos/recipe/pwgen.py [copied from slapos/recipe/duplicity.py with 75% similarity]
slapos/recipe/request.py
slapos/recipe/seleniumrunner/ERP5TypeFunctionalTestCase.py [new file with mode: 0644]
slapos/recipe/seleniumrunner/__init__.py [new file with mode: 0644]
slapos/recipe/seleniumrunner/erp5functionaltestreporthandler.py [new file with mode: 0644]
slapos/recipe/seleniumrunner/template/xvfb_run.in [new file with mode: 0644]
slapos/recipe/seleniumrunner/testrunner.py [new file with mode: 0644]
slapos/recipe/shell.py [copied from slapos/recipe/duplicity.py with 74% similarity]
slapos/recipe/shellinabox.py [new file with mode: 0644]
slapos/recipe/slaprunner/__init__.py
slapos/recipe/slaprunner/template/slapos.cfg.in
slapos/recipe/softwaretype.py
slapos/recipe/sshkeys_authority.py [new file with mode: 0644]
slapos/recipe/stunnel/__init__.py
slapos/recipe/stunnel/template/server.conf.in
slapos/recipe/waitfor.py [moved from slapos/recipe/helloworld.py with 75% similarity]
software/apache-frontend/instance.cfg [new file with mode: 0644]
software/apache-frontend/software.cfg [new file with mode: 0644]
software/cloudooo/development.cfg [new file with mode: 0644]
software/davstorage/instance-davstorage.cfg
software/davstorage/instance.cfg
software/davstorage/software.cfg
software/erp5testnode/instance-default.cfg [new file with mode: 0644]
software/erp5testnode/instance.cfg
software/erp5testnode/software.cfg
software/helloworld/instance.cfg [deleted file]
software/helloworld/software.cfg [deleted file]
software/java/software.cfg [deleted file]
software/kumofs/software.cfg
software/lamp-template/instance.cfg
software/lamp-template/software.cfg
software/lamp-template/template/phpmyadmin.inc.php.in
software/mysql-5.1/software.cfg
software/seleniumrunner/instance.cfg [new file with mode: 0644]
software/seleniumrunner/software.cfg [new file with mode: 0644]
software/slaprunner/instance.cfg
software/slaprunner/software.cfg
software/wordpress/instance-wordpress.cfg [deleted file]
software/wordpress/instance.cfg [deleted file]
software/wordpress/software.cfg
software/wordpress/wp-config.php.in
stack/apache-php.cfg [deleted file]
stack/cloudooo.cfg
stack/lamp.cfg
stack/lamp/buildout.cfg [new file with mode: 0644]
stack/lamp/instance-apache-backup.cfg [new file with mode: 0644]
stack/lamp/instance-apache-php.cfg [new file with mode: 0644]
stack/lamp/instance-backuped.cfg [new file with mode: 0644]
stack/lamp/instance-mariadb-pbsready-export.cfg [new file with mode: 0644]
stack/lamp/instance-mariadb-pbsready-import.cfg [new file with mode: 0644]
stack/lamp/instance-mariadb-pbsready.cfg [new file with mode: 0644]
stack/lamp/instance-mariadb.cfg [new file with mode: 0644]
stack/lamp/instance-pull-backup.cfg [new file with mode: 0644]
stack/lamp/instance.cfg [new file with mode: 0644]
stack/slapos.cfg [new file with mode: 0644]