mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into split_into_modules

Browse source 
Conflicts:
	.gitignore

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-26 09:36:36 +02:00
commit c8dc4181f6
5 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored
View file

@ -11,8 +11,8 @@ doc/man/man7/cdist-type__*.text
doc/man/man7/cdist-reference.text
doc/man/man*/docbook-xsl.css
# Ignore cache for version control
cache/
# Ignore cdist cache for version control
/cache/
# Python
**/__pycache__/
# Python / cache
__pycache__/