From 6becc0d1e7cbc1e3764d59824be6088f44c09e66 Mon Sep 17 00:00:00 2001 From: Yoram Hekma Date: Tue, 20 Sep 2016 11:05:17 +0200 Subject: [PATCH] Updated documentation --- conf/master | 6 +++--- doc/man/salt.7 | 7 ++++++- doc/ref/configuration/master.rst | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/conf/master b/conf/master index 0276c3aadf5..f4cfc231b3d 100644 --- a/conf/master +++ b/conf/master @@ -694,9 +694,9 @@ #pillar_safe_render_error: True # The pillar_source_merging_strategy option allows you to configure merging strategy -# between different sources. It accepts four values: recurse, aggregate, overwrite, -# or smart. Recurse will merge recursively mapping of data. Aggregate instructs -# aggregation of elements between sources that use the #!yamlex renderer. Overwrite +# between different sources. It accepts five values: none, recurse, aggregate, overwrite, +# or smart. None will not do any merging at all. Recurse will merge recursively mapping of data. +# Aggregate instructs aggregation of elements between sources that use the #!yamlex renderer. Overwrite # will overwrite elements according the order in which they are processed. This is # behavior of the 2014.1 branch and earlier. Smart guesses the best strategy based # on the "renderer" setting and is the default value. diff --git a/doc/man/salt.7 b/doc/man/salt.7 index 20f48544ef9..ad1271cf613 100644 --- a/doc/man/salt.7 +++ b/doc/man/salt.7 @@ -7571,9 +7571,14 @@ New in version 2014.7.0. Default: \fBsmart\fP .sp The pillar_source_merging_strategy option allows you to configure merging -strategy between different sources. It accepts 4 values: +strategy between different sources. It accepts 5 values: .INDENT 0.0 .IP \(bu 2 +\fBnone\fP: +.sp +it will not do any merging at all and only parse the pillar data from the passed +environment and 'base' if no environment was specified. +.IP \(bu 2 \fBrecurse\fP: .sp it will merge recursively mapping of data. For example, theses 2 sources: diff --git a/doc/ref/configuration/master.rst b/doc/ref/configuration/master.rst index 9719b16cb80..a2513b5dbbd 100644 --- a/doc/ref/configuration/master.rst +++ b/doc/ref/configuration/master.rst @@ -2791,6 +2791,9 @@ Default: ``smart`` The pillar_source_merging_strategy option allows you to configure merging strategy between different sources. It accepts 4 values: +* ``none``: + it will not do any merging at all and only parse the pillar data from the passed environment and 'base' if no environment was specified. + * ``recurse``: it will merge recursively mapping of data. For example, theses 2 sources: