CHANGES.txt · f6bccece229138414c9d2a5299247f60f4adda76 · nexedi / slapos · GitLab

Find file Blame History Permalink

Merge branch 'master' into apache · f6bccece

Rafael Monnerat authored Jul 13, 2011

Conflicts:
	CHANGES.txt
	component/slapos/buildout.cfg
	setup.py
	slapos/recipe/kumofs/__init__.py
	slapos/recipe/memcached/__init__.py
	slapos/recipe/mysql/__init__.py
	software/kumofs/software.cfg
	software/mysql-5.1/software.cfg

f6bccece

To find the state of this project's repository at the time of any of these versions, check out the tags.

CHANGES.txt 2.48 KB