Cory Wright
2995a05c2b
Make salt.auth.rest heading consistent with all other salt.auth documentation
2017-04-27 09:32:53 -04:00
Daniel Wallace
b60a8d013a
remove rackspace from index
2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6
remove deprecated firstgen rackspace cloud driver
2017-04-21 08:59:56 -06:00
Mike Place
785e6060a9
Add requested docs
2017-04-18 08:34:56 -06:00
Daniel Wallace
a86b101ae6
add retries on authentications of the salt minion reconnecting
2017-04-10 14:53:26 -06:00
Erik Johnson
a6d68f50fe
Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11
2017-04-06 10:15:47 -05:00
Erik Johnson
a6064fb2e4
Rename userdata_renderer -> userdata_template in master config docs
2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a
Add documentation for userdata_renderer
2017-04-04 15:40:50 -05:00
Mike Place
7a04ed2439
Merge pull request #40497 from DSRCorporation/features/39275_memcache
...
Memcache documentation and minor updates.
2017-04-04 13:55:17 -06:00
Erik Johnson
85b9bb4072
Fix label for RST link
2017-04-04 00:28:12 -05:00
Daniel Wallace
6e2f9080ca
update docs for logging handlers
2017-04-03 16:04:53 -05:00
Thomas S Hatch
6279f7c120
fix do to pre correct on python randome function
2017-04-03 14:50:07 -06:00
Thomas S Hatch
66b9515af7
Fix up the doc for failover clarity
2017-04-03 13:24:56 -06:00
Dmitry Kuzmenko
82c45b1a52
Memcache documentation and minor updates.
2017-04-03 19:51:50 +03:00
rallytime
5363e0b58b
Update minion data cache documentation
...
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
2017-03-24 14:25:46 -06:00
David Boucha
61f2fa9339
Add documentation for the Minion data cache
...
Includes docs for localfs and consul minion data cache modules
2017-03-24 11:49:26 -06:00
C. R. Oldham
bb71710747
Revert "Add special token to insert the minion id into the default_include path"
2017-03-21 13:41:03 -06:00
Mike Place
dc7d4f4224
Merge pull request #39935 from cro/namespace_proxy_cfg
...
Add special token to insert the minion id into the default_include path
2017-03-10 10:51:54 -07:00
rallytime
c8b5d390b5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/minion.py
2017-03-09 16:05:15 -07:00
C. R. Oldham
e4aef54c73
Add special token to insert the minion id into the default_include path
2017-03-09 15:31:16 -07:00
Erik Johnson
7178e77eee
Improve the Top File matching docs
...
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
2017-03-03 10:40:22 -06:00
rallytime
65b239664e
Restore ipv6 connectivity and "master: <ip>:<port>" support
2017-03-01 14:15:07 -07:00
rallytime
7b9b3f700d
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/dockerng.py
- salt/states/dockerng.py
2017-02-22 16:27:08 -07:00
Ivan Babrou
55965ce505
Autodetect IPv6 connectivity from minion to master
2017-02-09 11:33:21 -08:00
rallytime
2f74dcf685
Various doc updates to fix warnings in doc build
2017-02-06 16:56:58 -07:00
rallytime
6504bb6b02
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/modules/pillar.py
- salt/states/archive.py
- tests/integration/states/archive.py
2017-02-03 09:48:58 -07:00
Ivan Babrou
6ffeda3ee5
Clarify ipv6 option for minion and inteface for master, closes #39118 ( #39131 )
...
* Clarify ipv6 option for minion and inteface for master, closes #39118
* Add ipv6 reference
2017-02-02 08:35:00 -07:00
rallytime
b866427f59
Add a bunch of missing doc module references
...
Also added an index.rst file for executors, renamed the
azurearm.rst file (Was misspelled with "azureare"), and
removed the xbps-pkg.rst file since that is an invalid
reference.
2017-01-31 15:12:34 -07:00
rallytime
fdaa5ac1b0
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/master.py
- salt/pillar/__init__.py
- salt/utils/__init__.py
2017-01-26 14:09:37 -07:00
Erik Johnson
6b014e53fc
Rename on_demand_pillar to on_demand_ext_pillar
2017-01-25 15:08:57 -06:00
Erik Johnson
d216f90c63
Document new on_demand_pillar option and add to config template
2017-01-25 14:43:14 -06:00
Erik Johnson
42a3652620
Add top file merging docs to the master config file documentation
...
Also put the top file stuff in its own section of the minion config
file, along with a message explaining that these options are only used
in masterless salt.
2017-01-23 20:38:03 -06:00
rallytime
30e8a66fb0
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/netapi/rest_tornado/saltnado.py
- tests/integration/netapi/rest_tornado/test_app.py
2017-01-16 18:54:14 -07:00
Denys Havrysh
51d4707071
DOCS: add links to File State Backups page where necessary ( #38735 )
2017-01-14 11:49:21 -07:00
Yoram Hekma
57df3bf148
The test
option is only valid for the minion, not the master
2017-01-12 09:13:46 +01:00
rallytime
efb8a8ddf5
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/ref/configuration/minion.rst
- salt/config/__init__.py
- salt/minion.py
2016-12-22 10:39:14 -07:00
Erik Johnson
27253522c8
Improve pillar documentation ( #38407 )
...
* rename anchor
* Move pillar cache config option to different section, add an anchor
* Add links to master and minion config items
* Add documentation for pillar.item's "delimiter" argument
* Improve pillar documentation
This improves RST formatting, adding hyperlinks as well as adding
information on the difference between in-minion pillar data and
pillar data that is compiled on-demand.
* Add section on how pillar environments are handled
2016-12-22 10:32:37 -07:00
Mike Place
68430b1fa6
Merge pull request #38348 from rallytime/mod-docs-2016.11
...
Update autodoc topics for new modules added in 2016.11
2016-12-20 13:36:20 -07:00
Dmitry Kuzmenko
dad748f57a
Data cache plugin configuration documentation.
2016-12-20 19:32:48 +03:00
rallytime
c6e191ad0d
Remove doc markup references from 2016.11 branch
2016-12-19 15:14:37 -07:00
rallytime
513058945c
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- doc/ref/states/requisites.rst
- doc/topics/cloud/profitbricks.rst
- doc/topics/cloud/vsphere.rst
- doc/topics/releases/0.9.8.rst
- doc/topics/releases/releasecandidate.rst
- salt/cloud/clouds/vsphere.py
- salt/minion.py
- salt/states/archive.py
- tests/unit/states/archive_test.py
2016-12-19 14:58:39 -07:00
rallytime
366271f459
Add snapper to state index doc module list
2016-12-19 10:32:44 -07:00
rallytime
135d254c80
Remove netapi autodoc files: they should not be added as their doc structure is different
2016-12-19 17:00:20 +00:00
rallytime
0006139aca
Update autodoc topics for new modules added in 2016.11
2016-12-19 16:44:34 +00:00
Mike Place
c83db5a785
Merge pull request #38320 from rallytime/cleanup-doc-refs
...
Cleanup doc internal markup references
2016-12-18 05:31:27 -07:00
rallytime
5940db5b3f
Merge branch '2016.3' into '2016.11'
...
No conflict.
2016-12-16 15:25:08 -07:00
Nicole Thomas
9e35f5dd08
Add azurearm module to doc index ( #38322 )
2016-12-16 14:44:20 -07:00
rallytime
23bce1c929
Remove ":doc:" references from all doc/topics/releases/* files
2016-12-15 16:45:51 -07:00
rallytime
4aafa41d22
Remove ":doc:" references from a bunch of doc/* files
2016-12-15 16:09:27 -07:00
rallytime
02bfe7912c
Remove more ":doc:" references from doc/* files
2016-12-15 15:36:44 -07:00