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

author	Gabriel Monnerat <gabriel@tiolive.com>
	Tue, 20 Mar 2012 15:31:54 +0000 (12:31 -0300)
committer	Gabriel Monnerat <gabriel@tiolive.com>
	Tue, 20 Mar 2012 15:45:48 +0000 (12:45 -0300)
commit	fd8020743cf2bd4ed59b8af4540e133b9b652352
tree	d3dde27bb029b7e1dd5b93cce9ce46f4e6b4b885	tree \| snapshot
parent	fd82b4c67cb7b5ec94c48310da383c78a7e5094a	commit \| diff

merge master into erp5 branch

131 files changed:

CHANGES.txt		diff \| blob \| blame \| history
MANIFEST.in		diff \| blob \| blame \| history
component/alsa/buildout.cfg	[new file with mode: 0644]	blob
component/binutils/buildout.cfg	[new file with mode: 0644]	blob
component/boa/buildout.cfg	[new file with mode: 0644]	blob
component/busybox/buildout.cfg	[new file with mode: 0644]	blob
component/chromium/buildout.cfg	[new file with mode: 0644]	blob
component/cloudooo/buildout.cfg		diff \| blob \| blame \| history
component/dbus/buildout.cfg	[new file with mode: 0644]	blob
component/dropbear/buildout.cfg		diff \| blob \| blame \| history
component/dropbear/dropbear-0.53.1-static_build_fix.patch	[new file with mode: 0644]	blob
component/dropbear/no-shell-checking.patch	[new file with mode: 0644]	blob
component/dropbear/userspace.patch		diff \| blob \| blame \| history
component/firefox/buildout.cfg	[new file with mode: 0644]	blob
component/fontconfig/buildout.cfg		diff \| blob \| blame \| history
component/gtk-2/buildout.cfg	[new file with mode: 0644]	blob
component/intltool/buildout.cfg	[new file with mode: 0644]	blob
component/mesa/buildout.cfg	[new file with mode: 0644]	blob
component/mydumper/buildout.cfg	[new file with mode: 0644]	blob
component/mydumper/mydumper-remove-warnings-errors.patch	[new file with mode: 0644]	blob
component/opera/buildout.cfg	[new file with mode: 0644]	blob
component/perl-XML-Parser/buildout.cfg	[new file with mode: 0644]	blob
component/pwgen/buildout.cfg	[new file with mode: 0644]	blob
component/qt/buildout.cfg	[new file with mode: 0644]	blob
component/shellinabox/0001-Switch-to-IPv6.patch	[new file with mode: 0644]	blob
component/shellinabox/0002-Allow-to-run-entire-command-path.patch	[new file with mode: 0644]	blob
component/shellinabox/buildout.cfg	[new file with mode: 0644]	blob
component/slapos/buildout.cfg		diff \| blob \| blame \| history
component/xorg/buildout.cfg		diff \| blob \| blame \| history
setup.py		diff \| blob \| blame \| history
slapos/recipe/README.apache_frontend.txt	[new file with mode: 0644]	blob
slapos/recipe/README.helloworld.txt	[deleted file]	blob \| blame \| history
slapos/recipe/README.seleniumrunner.txt	[new file with mode: 0644]	blob
slapos/recipe/_urlparse.py	[copied from slapos/recipe/duplicity.py with 71% similarity]	diff \| blob \| blame \| history
slapos/recipe/apache_frontend/__init__.py	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/certificate_authority.py	[copied from slapos/recipe/certificate_authority/certificate_authority.py with 87% similarity, mode: 0755]	diff \| blob \| blame \| history
slapos/recipe/apache_frontend/template/apache.conf.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/apache.conf.path-protected.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/apache.location-snippet.conf.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/apache.ssl-snippet.conf.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/logrotate_entry.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/notfound.html	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/openssl.cnf.ca.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/stunnel.conf.entry.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/stunnel.conf.in	[new file with mode: 0644]	blob
slapos/recipe/apache_frontend/template/varnish.vcl.in	[new file with mode: 0644]	blob
slapos/recipe/apachephp/__init__.py	[new file with mode: 0644]	blob
slapos/recipe/apachephp/template/apache.in	[new file with mode: 0644]	blob
slapos/recipe/apachephp/template/php.ini.in	[new file with mode: 0644]	blob
slapos/recipe/apacheproxy/__init__.py	[copied from slapos/recipe/duplicity.py with 56% similarity]	diff \| blob \| blame \| history
slapos/recipe/apacheproxy/template/apache.in	[new file with mode: 0644]	blob
slapos/recipe/certificate_authority/__init__.py		diff \| blob \| blame \| history
slapos/recipe/certificate_authority/certificate_authority.py		diff \| blob \| blame \| history
slapos/recipe/davstorage/__init__.py		diff \| blob \| blame \| history
slapos/recipe/dropbear.py	[new file with mode: 0644]	blob
slapos/recipe/duplicity.py		diff \| blob \| blame \| history
slapos/recipe/equeue.py	[copied from slapos/recipe/duplicity.py with 79% similarity]	diff \| blob \| blame \| history
slapos/recipe/erp5testnode/__init__.py		diff \| blob \| blame \| history
slapos/recipe/librecipe/__init__.py		diff \| blob \| blame \| history
slapos/recipe/librecipe/execute.py		diff \| blob \| blame \| history
slapos/recipe/librecipe/filehash.py	[new file with mode: 0644]	blob
slapos/recipe/librecipe/generic.py		diff \| blob \| blame \| history
slapos/recipe/librecipe/genericslap.py		diff \| blob \| blame \| history
slapos/recipe/librecipe/inotify.py	[copied from slapos/recipe/duplicity.py with 66% similarity]	diff \| blob \| blame \| history
slapos/recipe/lockfile.py	[new file with mode: 0644]	blob
slapos/recipe/mydumper.py	[new file with mode: 0644]	blob
slapos/recipe/mysql/__init__.py		diff \| blob \| blame \| history
slapos/recipe/mysql/backup.py		diff \| blob \| blame \| history
slapos/recipe/mysql/catdatefile.py	[deleted file]	blob \| blame \| history
slapos/recipe/mysql/recover.py	[deleted file]	blob \| blame \| history
slapos/recipe/mysql/template/my.cnf.in		diff \| blob \| blame \| history
slapos/recipe/notifier.py	[new file with mode: 0644]	blob
slapos/recipe/pbs.py	[new file with mode: 0644]	blob
slapos/recipe/publish.py		diff \| blob \| blame \| history
slapos/recipe/publishurl.py		diff \| blob \| blame \| history
slapos/recipe/pulse2/__init__.py		diff \| blob \| blame \| history
slapos/recipe/pwgen.py	[copied from slapos/recipe/duplicity.py with 75% similarity]	diff \| blob \| blame \| history
slapos/recipe/request.py		diff \| blob \| blame \| history
slapos/recipe/seleniumrunner/ERP5TypeFunctionalTestCase.py	[new file with mode: 0644]	blob
slapos/recipe/seleniumrunner/__init__.py	[new file with mode: 0644]	blob
slapos/recipe/seleniumrunner/erp5functionaltestreporthandler.py	[new file with mode: 0644]	blob
slapos/recipe/seleniumrunner/template/xvfb_run.in	[new file with mode: 0644]	blob
slapos/recipe/seleniumrunner/testrunner.py	[new file with mode: 0644]	blob
slapos/recipe/shell.py	[copied from slapos/recipe/duplicity.py with 74% similarity]	diff \| blob \| blame \| history
slapos/recipe/shellinabox.py	[new file with mode: 0644]	blob
slapos/recipe/slaprunner/__init__.py		diff \| blob \| blame \| history
slapos/recipe/slaprunner/template/slapos.cfg.in		diff \| blob \| blame \| history
slapos/recipe/softwaretype.py		diff \| blob \| blame \| history
slapos/recipe/sshkeys_authority.py	[new file with mode: 0644]	blob
slapos/recipe/stunnel/__init__.py		diff \| blob \| blame \| history
slapos/recipe/stunnel/template/server.conf.in		diff \| blob \| blame \| history
slapos/recipe/waitfor.py	[moved from slapos/recipe/helloworld.py with 75% similarity]	diff \| blob \| blame \| history
software/apache-frontend/instance.cfg	[new file with mode: 0644]	blob
software/apache-frontend/software.cfg	[new file with mode: 0644]	blob
software/cloudooo/development.cfg	[new file with mode: 0644]	blob
software/davstorage/instance-davstorage.cfg		diff \| blob \| blame \| history
software/davstorage/instance.cfg		diff \| blob \| blame \| history
software/davstorage/software.cfg		diff \| blob \| blame \| history
software/erp5testnode/instance-default.cfg	[new file with mode: 0644]	blob
software/erp5testnode/instance.cfg		diff \| blob \| blame \| history
software/erp5testnode/software.cfg		diff \| blob \| blame \| history
software/helloworld/instance.cfg	[deleted file]	blob \| blame \| history
software/helloworld/software.cfg	[deleted file]	blob \| blame \| history
software/java/software.cfg	[deleted file]	blob \| blame \| history
software/kumofs/software.cfg		diff \| blob \| blame \| history
software/lamp-template/instance.cfg		diff \| blob \| blame \| history
software/lamp-template/software.cfg		diff \| blob \| blame \| history
software/lamp-template/template/phpmyadmin.inc.php.in		diff \| blob \| blame \| history
software/mysql-5.1/software.cfg		diff \| blob \| blame \| history
software/seleniumrunner/instance.cfg	[new file with mode: 0644]	blob
software/seleniumrunner/software.cfg	[new file with mode: 0644]	blob
software/slaprunner/instance.cfg		diff \| blob \| blame \| history
software/slaprunner/software.cfg		diff \| blob \| blame \| history
software/wordpress/instance-wordpress.cfg	[deleted file]	blob \| blame \| history
software/wordpress/instance.cfg	[deleted file]	blob \| blame \| history
software/wordpress/software.cfg		diff \| blob \| blame \| history
software/wordpress/wp-config.php.in		diff \| blob \| blame \| history
stack/apache-php.cfg	[deleted file]	blob \| blame \| history
stack/cloudooo.cfg		diff \| blob \| blame \| history
stack/lamp.cfg		diff \| blob \| blame \| history
stack/lamp/buildout.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-apache-backup.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-apache-php.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-backuped.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-mariadb-pbsready-export.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-mariadb-pbsready-import.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-mariadb-pbsready.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-mariadb.cfg	[new file with mode: 0644]	blob
stack/lamp/instance-pull-backup.cfg	[new file with mode: 0644]	blob
stack/lamp/instance.cfg	[new file with mode: 0644]	blob
stack/slapos.cfg	[new file with mode: 0644]	blob

(lab) SlapOS recipes

RSS Atom