* Added "none" option for pillar_source_merging_strategy
* added none to merging strategy in dictupdate so we no longer log warnings when it is selected
* Updated documentation
* fix for when pillar_source_merging_strategy is not set
* Fix looking up pillar data when merging is set to "none" and no saltenv was passed
* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry
* Let's not break when no merging strategy is passed
* Capitalisation
* Update on doc
These were copypasta'ed from gitfs' blacklist/whitelist example, but
they aren't as apropos here because the blacklist/whitelist for minionfs
is meant to refer to minion IDs, not branches/tags like in gitfs.
These docs do not tell people how to deal with branch diversions which
happen as a result of a rebase, and could lead (let's be real, probably
_has led_) to users pulling/merging, which will add a buttload of
unrelated commits to their pull request.
This update shows how to force-push when necessary.
Fixes#36475
By adding the "bash" argument, we avoid the following error and the docs
will display appropriately:
```
/root/SaltStack/salt/doc/topics/tutorials/gitfs.rst:918: ERROR: Error in "code-block" directive:
1 argument(s) required, 0 supplied.
.. code-block::
Cmnd_Alias SALT_GIT_HOOK = /bin/salt-call event.fire_master update salt/fileserver/gitfs/update
Defaults!SALT_GIT_HOOK !requiretty
ALL ALL=(root) NOPASSWD: SALT_GIT_HOOK
```
* Updates doc builds to generate build timestamp only when building for docs.saltstack.com. This re-enables incremental builds.
Adds notes to OS X page that Salt master on OS X is not officially supported
Adds note to postgres returners to cross-link modules with usage explanation (ZD #875)
Adds example showing how to enable tcp transport
* Generate copyright date
Footer updates
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.
These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
