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

author	Kazuhiko Shiozaki <kazuhiko@nexedi.com>
	Mon, 29 Apr 2013 10:18:59 +0000 (12:18 +0200)
committer	Kazuhiko Shiozaki <kazuhiko@nexedi.com>
	Mon, 29 Apr 2013 10:18:59 +0000 (12:18 +0200)
commit	7efe7cc167547c7cb5e094bbfed0a9d3fcddcee4
tree	447cb9b7f7abd297e7af6d2f3d273ecf19b7978b	tree \| snapshot
parent	d08c11ce4f19f3b1ae9bc2f70542f97fffb6936c	commit \| diff

Merge branch 'master' into erp5-component

21 files changed:

CHANGES.txt		diff \| blob \| blame \| history
component/noVNC/buildout.cfg		diff \| blob \| blame \| history
component/qemu-kvm/buildout.cfg		diff \| blob \| blame \| history
setup.py		diff \| blob \| blame \| history
slapos/recipe/apachephp/__init__.py		diff \| blob \| blame \| history
slapos/recipe/kvm_frontend/__init__.py		diff \| blob \| blame \| history
slapos/recipe/kvm_frontend/template/kvm-proxy.js		diff \| blob \| blame \| history
slapos/recipe/kvm_frontend/template/nodejs_run.in		diff \| blob \| blame \| history
software/kvm/common.cfg		diff \| blob \| blame \| history
software/kvm/development.cfg		diff \| blob \| blame \| history
software/kvm/instance-frontend.cfg.in		diff \| blob \| blame \| history
software/kvm/instance-kvm.cfg.in		diff \| blob \| blame \| history
software/kvm/instance-kvmplus.cfg.in	[deleted file]	blob \| blame \| history
software/kvm/instance.cfg.in		diff \| blob \| blame \| history
software/kvm/software.cfg		diff \| blob \| blame \| history
software/tt-rss/development.cfg	[new file with mode: 0644]	blob
software/tt-rss/instance-custom.cfg.in		diff \| blob \| blame \| history
software/tt-rss/software.cfg		diff \| blob \| blame \| history
software/tt-rss/template/config.php.in		diff \| blob \| blame \| history
stack/lamp/apache/instance-apache-php.cfg.in		diff \| blob \| blame \| history
stack/lamp/buildout.cfg		diff \| blob \| blame \| history

(lab) SlapOS recipes