Merge remote-tracking branch 'telmich/master'

This commit is contained in:
Steven Armstrong 2011-11-18 14:36:14 +01:00
commit 18cef34187
2 changed files with 2 additions and 3 deletions

View file

@ -13,6 +13,8 @@ TESTS
- multiple defines of object:
- fail if different parameters
- succeed if same parameters
- verify that all env variables in doc/man/cdist-reference.text.sh
exist in the right stages
USER INTERFACE
--------------

View file

@ -188,9 +188,6 @@ __object_name::
__target_host::
The host we are deploying to.
Available for: initial manifest, type manifest, type gencode
__target_user::
User to use for authentication on remote host.
Currently static in core.
__type::
Path to the current type.
Available for: type manifest, type gencode