Nicole Thomas
6942d5d95b
Merge pull request #37995 from rallytime/merge-2016.3
...
[2016.3] Merge forward from 2015.8 to 2016.3
2016-11-30 13:12:55 -07:00
Mike Place
69a74a4d2d
Merge pull request #37950 from vutny/fix-starting-up-syndic
...
Set default Salt Master address for a Syndic (like for a Minion)
2016-11-30 11:09:03 -07:00
rallytime
b44e17921c
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-11-30 09:21:45 -07:00
Denys Havrysh
7d9bc9abce
syndic_master: correct default value, documentation and example config
2016-11-30 17:18:44 +02:00
Erik Johnson
61ed9a8657
Add clarifying language to ext_pillar_first docs
...
Also remove a sentence which may lead people to believe that they can
make git_pillar and pillar_roots share top/sls files and be compiled
together.
2016-11-29 15:49:05 -06:00
Erik Johnson
7f269bc7f9
Add clarification on expr_form usage and future deprecation ( #37964 )
2016-11-29 13:45:11 -07:00
Mike Place
ea46639ce7
Merge pull request #37272 from vutny/fix-getting-default-logging-opts
...
Get default logging level and log file from default opts dict
2016-11-28 16:04:20 -07:00
rallytime
523a67c422
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/conf.py
- doc/topics/releases/version_numbers.rst
2016-11-28 10:52:52 -07:00
Erik Johnson
4cdc6cf5ec
Update earlier release channels' docs with Carbon release notes ( #37914 )
...
* Update reference to Carbon in vsphere docs
* Replace reference to Carbon in top file merging docs
* Include Carbon version number
* Replace references to Carbon with 2016.11.0
2016-11-28 10:33:31 -07:00
Benjamin Drung
9a51ba5c5b
Fix various spelling mistakes
2016-11-24 16:00:31 +01:00
Denys Havrysh
83d6a44254
Add ssh_log_file
option to master config and documentation
2016-11-20 16:13:55 +02:00
Denys Havrysh
c8a0915460
Fix configuration example and documentation for syndic_log_file
option
2016-11-19 13:11:36 +02:00
Jonathan Ballet
89b9417605
Documentation rendering fixes ( #37543 )
...
* doc: fix documentation rendering of salt.runners.survey
* doc: fix Sphinx documentation warnings
2016-11-08 09:42:12 -07:00
Justin Findlay
478def4923
doc.ref.configuration.minion: add proxy vars
2016-10-18 10:50:37 -06:00
rallytime
5362e5183e
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/ref/cli/index.rst
2016-10-12 12:36:00 -06:00
Mate Ory
d2f8f18430
doc: document what the argument of salt --subset means
2016-10-12 10:42:31 -06:00
Nicole Thomas
7838d8d3f9
Remove "Targeting with Executions" section from docs ( #36925 )
...
This feature was removed long ago and is no longer under development.
Fixes #36906
2016-10-11 16:33:56 -06:00
Erik Johnson
a56bf8bd2d
Update references to future default value change that was reverted ( #36924 )
2016-10-11 16:33:41 -06:00
Justin Findlay
cc071b75cb
doc.glossary: add idempotent
2016-10-06 16:17:22 -06:00
Mike Place
4bdb997dae
Merge pull request #36785 from cachedout/pr-36728
...
Fixup merge forward #36728
2016-10-05 20:02:16 +09:00
rallytime
24b8bba145
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-09-30 16:13:08 -06:00
Yoram Hekma
3bb2cb6379
Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy
2016-09-30 15:59:21 -06:00
Erik Johnson
3d15eedfe0
Add additional information about onchanges/onchanges_in
2016-09-29 23:02:39 -05:00
Justin Findlay
4dd4fc94dc
log levels doc: try long form table
...
sphinx didn't render the shorthand table
2016-09-29 10:11:06 -06:00
rallytime
da574e5b03
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/client/ssh/__init__.py
- salt/config/__init__.py
- salt/runners/thin.py
2016-09-28 09:01:24 -06:00
Bo Maryniuk
a441b35588
Add documentation about Salt Thin configuration
2016-09-27 11:12:07 +02:00
Nicole Thomas
5548ed771d
Back-port #36435 to 2016.3 ( #36532 )
...
* 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
2016-09-23 13:36:23 -06:00
Erik Johnson
cc9d41fb0e
Change items in minionfs blacklist/whitelist example
...
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.
2016-09-22 18:22:03 -05:00
rallytime
9e55bee5d5
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-08-30 10:17:53 -06:00
Loren Gordon
08e10f69eb
Clarifies how to create aliased functions ( #35891 )
2016-08-30 10:04:58 -06:00
Nicole Thomas
96792663da
Add engines to list of extension module options in master config docs ( #35864 )
...
Fixes #35837
2016-08-29 12:22:30 -06:00
rallytime
5f93d682aa
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/client/ssh/__init__.py
2016-08-29 10:56:11 -06:00
Erik Johnson
c534d88280
More clarification/correction in minion docs
2016-08-27 15:18:06 -05:00
Erik Johnson
e9e6ea8485
One more tweak to top file merging docs
...
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
2016-08-27 14:30:14 -05:00
rallytime
e8e73b55ac
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- doc/topics/jobs/schedule.rst
- salt/states/user.py
2016-08-26 13:21:12 -06:00
Nicole Thomas
0ee237a9cb
Remove extra "to" in top.rst docs ( #35808 )
...
Refs #35774
2016-08-26 10:38:57 -06:00
Alexander Bauer
e4dfc21581
Trivial documentation spelling fix ( #35800 )
...
Change `statnds` to `stands` in State Writing documentation.
2016-08-26 10:30:08 -06:00
Erik Johnson
2fc61763d8
Correct the top_file_merging_strategy documentation ( #35774 )
...
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.
2016-08-26 10:25:56 -06:00
Nicole Thomas
cd90052187
Documentation spelling fixes ( #35773 )
...
Fixes #35771
2016-08-25 13:41:03 -06:00
rallytime
1d819d7cc2
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-08-22 09:29:13 -06:00
Brian Glogower
2801f0fdcc
Remove duplicate auth_tries in minion docs
2016-08-19 17:46:26 -07:00
Nicole Thomas
f7f8221169
Everything in the sample master config file should be commented out ( #35611 )
2016-08-19 16:05:40 -06:00
rallytime
6a86a12294
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/modules/cp.py
2016-08-15 11:23:44 -06:00
Mike Place
09925ba353
Minor doc fixup ( #35436 )
...
* Minor doc fixup
Refs #35387
* Include reload_grains
2016-08-15 09:53:56 -06:00
Justin Findlay
66332510c6
doc.ref.configuration.logging: document log levels
2016-08-10 14:10:43 -06:00
Justin Findlay
93616eff3e
doc.ref.configuration.logging: fix formatting
2016-08-10 10:47:07 -06:00
Justin Findlay
472a2d31de
doc.ref.configuration.logging: cleanup formatting
2016-08-10 10:46:39 -06:00
C. R. Oldham
84cc7d67c0
Add documentation for append_minionid_config_dirs.
2016-08-03 12:36:37 -06:00
rallytime
7d106c78f0
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-07-18 09:45:00 -06:00
rallytime
9c803d05a5
Add output_file option to master config docs
...
Fixes #34703
2016-07-16 12:45:55 -06:00