fnux
/
cdist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into feature_files_export

This commit is contained in:
Nico Schottelius 2014-04-12 19:44:05 +02:00
parent c818442ef2 a568d5da0f
commit 2eab8d49af
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changelog
View File

@ -6,6 +6,7 @@ Changelog
3.1.2: 3.1.2:
* Documentation: Add missing environment variables to reference
* Type __qemu_img: size is optional, if state is not present * Type __qemu_img: size is optional, if state is not present
* Type __key_value: Rewrite using awk (Daniel Heule) * Type __key_value: Rewrite using awk (Daniel Heule)
* New Type: __dog_vdi * New Type: __dog_vdi

8
docs/man/cdist-reference.text.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# 2010-2013 Nico Schottelius (nico-cdist at schottelius.org) # 2010-2014 Nico Schottelius (nico-cdist at schottelius.org)
# 2014 Daniel Heule (hda at sfs.biz) # 2014 Daniel Heule (hda at sfs.biz)
# #
# This file is part of cdist. # This file is part of cdist.
@ -237,6 +237,12 @@ The following environment variables influence the behaviour of cdist:
require:: require::
Setup dependencies between objects (see cdist-manifest(7)) Setup dependencies between objects (see cdist-manifest(7))
CDIST_LOCAL_SHELL::
Use this shell locally instead of /bin/sh to execute scripts
CDIST_REMOTE_SHELL::
Use this shell remotely instead of /bin/sh to execute scripts
CDIST_OVERRIDE:: CDIST_OVERRIDE::
Allow overwriting type parameters (see cdist-manifest(7)) Allow overwriting type parameters (see cdist-manifest(7))