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

Merge branch 'master' into 2.1_pypi_integration

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>

Conflicts:
	.gitignore
	build
This commit is contained in:
Nico Schottelius 2012-10-25 22:35:20 +02:00
commit 5d319027d0
7 changed files with 55 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.gitignore vendored
View file

@ -7,14 +7,15 @@ docs/man/man1/*.1
docs/man/man7/*.7
docs/man/man*/*.html
docs/man/man*/*.xml
docs/man/man*/docbook-xsl.css
docs/man/man7/cdist-type__*.text
docs/man/man7/cdist-reference.text
docs/man/man*/docbook-xsl.css
# Ignore cdist cache for version control
/cache/
# Python: cache, distutils
# Python: cache, distutils, distribution in general
__pycache__/
MANIFEST
dist/
lib/cdist/version_static.py