cdist/cdist/conf
Nico Schottelius 5389d71905 Merge branch 'master' into 4.0-pre-not-stable
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
	docs/changelog
2014-02-05 23:22:04 +01:00
..
explorer Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-01-20 14:28:49 +01:00
manifest re-add sample, but longer name 2012-10-30 16:33:18 +01:00
type Merge branch 'master' into 4.0-pre-not-stable 2014-02-05 23:22:04 +01:00
.gitignore make package_data work 2012-10-29 22:50:27 +01:00
README make package_data work 2012-10-29 22:50:27 +01:00

README

This is a sample configuration that can be used as an example
for /etc/cdist.

For instance:

   [root@kr etc]# ln -s ~nico/p/cdist/conf/ /etc/cdist