Merge branch 'master' into feature_init_process

Conflicts:
	doc/changelog

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-01-20 11:40:09 +01:00
commit f290b94d7b
32 changed files with 296 additions and 66 deletions

View file

@ -180,6 +180,7 @@ __object::
__object_id::
The type unique object id.
Available for: type manifest, type explorer, type gencode
Note: The leading "/" will always be stripped.
__self::
DEPRECATED: Same as __object_name, do not use anymore, use __object_name instead.
Will be removed in cdist 3.x.