-
Gabriel Monnerat authored
Conflicts fixed: CHANGES.txt component/apache/buildout.cfg component/cclient/buildout.cfg component/cclient/imap-2007f.patch component/curl/buildout.cfg component/dropbear/buildout.cfg component/dropbear/userspace.patch component/freetype/buildout.cfg component/gcc/buildout.cfg component/git/buildout.cfg component/groonga/buildout.cfg component/haproxy/buildout.cfg component/libpng/buildout.cfg component/mariadb/buildout.cfg component/memcached/buildout.cfg component/mysql-5.1/buildout.cfg component/ncurses/buildout.cfg component/openssl/buildout.cfg component/perl-DBD-MySQL/buildout.cfg component/perl/buildout.cfg component/readline/buildout.cfg component/slapos/buildout.cfg component/sqlite3/buildout.cfg component/xorg/buildout.cfg component/xtrabackup/buildout.cfg component/xtrabackup/xtrabackup-1.6.2_build.patch setup.py slapos/recipe/README.lamp.txt slapos/recipe/certificate_authority/__init__.py slapos/recipe/certificate_authority/certificate_authority.py slapos/recipe/davstorage/__init__.py slapos/recipe/dcron.py slapos/recipe/duplicity.py slapos/recipe/erp5/__init__.py slapos/recipe/erp5/template/haproxy.cfg.in slapos/recipe/erp5/template/initmysql.sql.in slapos/recipe/erp5/template/zope-zeo-snippet.conf.in slapos/recipe/erp5/template/zope-zodb-snippet.conf.in slapos/recipe/erp5_update/erp5.py slapos/recipe/kvm/__init__.py slapos/recipe/lamp/__init__.py slapos/recipe/lamp/template/my.cnf.in slapos/recipe/librecipe/__init__.py slapos/recipe/librecipe/execute.py slapos/recipe/librecipe/generic.py slapos/recipe/librecipe/genericslap.py slapos/recipe/logrotate.py slapos/recipe/mkdirectory.py slapos/recipe/mysql/__init__.py slapos/recipe/mysql/backup.py slapos/recipe/publishurl.py slapos/recipe/request.py slapos/recipe/simplelogger.py slapos/recipe/softwaretype.py slapos/recipe/stunnel/__init__.py slapos/recipe/stunnel/template/server.conf.in slapos/recipe/xwiki/template/my.cnf.in software/cloudooo/software.cfg software/erp5/instance.cfg software/erp5/software.cfg software/kvm/software.cfg software/nbd/software.cfg software/vifib/software.cfg stack/cloudooo.cfg stack/erp5.cfg stack/kvm.cfg stack/nbd.cfg
72acaad9
To find the state of this project's repository at the time of any of these versions, check out
the tags.