Merge branch 'dev' of git://git.d-roth.li/cdist

Conflicts:
	conf/manifest/init

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-03-12 19:11:24 +01:00
commit bfb43079e3
7 changed files with 105 additions and 1 deletions

View file

@ -9,7 +9,6 @@ Types to be written/extended:
- __service
- __user
- __file_edit
- add_line_to_file_if_not_existing
- delete_line_from_file
- regexp replace (can probably cover all?)
- __file: