Nicole Thomas
4f3596a69f
Add comment for test=true w/o changes ret and add changes dict example ( #33254 )
...
Fixes #30258
Add simple changes dictionary example
2016-05-15 13:13:43 -07:00
Nicole Thomas
6fb25a8440
Make note of files that begin with '_' in master.d or minion.d dirs ( #33224 )
...
* Make note of files that begin with '_' in master.d or minion.d dirs
Fixes #21903
* Be more specific about where '_' files come from.
2016-05-13 09:14:57 -07:00
Justin Findlay
b2d7c81f66
doc.ref.states.ordering: clarify requisite change ( #32934 )
2016-04-28 15:41:01 -06:00
Nicole Thomas
f581a8218d
Remove FileClient class references from docs - it doesn't exist. ( #32925 )
...
* Remove FileClient class references from docs - it doesn't exist.
Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.
Fixes #32646
* Don't reference minion import when not used
2016-04-28 14:14:40 -06:00
rallytime
9064d3bbfb
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/file.py
- salt/states/archive.py
2016-04-25 15:45:17 -06:00
Justin Findlay
9b5c14c37c
salt-cloud -u
downloads stable version from bootstrap.saltstack.com by default (#32837 )
...
* salt-cloud -u downloads stable version
* utils.cloud.update_bootstrap: minor edits of docstring
2016-04-25 13:53:54 -06:00
Denys Havrysh
3751a270d7
Document pillar cache options ( #32643 )
...
* Add note about Pillar data cache requirement for Pillar targeting method
* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs
* Minor fixes in docs
* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting
* Document Pillar Cache Options for Salt Master
* Document Minions Targeting with Mine
* Remove `saltutil.refresh_pillar` scheduled persistent job
2016-04-22 08:54:30 -06:00
Erik Johnson
ab9da90ced
Revert PR #32480 and apply #32314 with fixes / documentation ( #32558 )
...
* Revert "Fix loop in maint.flo"
This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.
* Revert "Clear VCS fsbackend and git_pillar locks on master start"
This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.
* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"
This reverts commit 4c2db32419022501eae2a695ec488693e043d189.
* prevent eternal gitfs lock due to process crash
* Use salt.utils.fopen() instead of open()
* Make pid locking work for more than just gitfs
Also, make logging more descriptive, to aid in troubleshooting.
* Add git_pillar_global_lock config option default value
* Document proper usage of {gitfs,git_pillar}_global_lock
2016-04-14 10:36:59 -06:00
rallytime
fbaeb165c9
Merge branch '2015.5' into merge-2015.8
...
No conflicts.
2016-04-13 09:07:39 -06:00
rallytime
46a4e8a310
Remove merge conflict line
2016-04-13 09:05:31 -06:00
Andrew Pashkin
e0d947c707
Document "grains" setting in the minion configuration reference
2016-04-13 08:56:05 -06:00
rallytime
1b04f0ddec
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/configuration/minion.rst
- doc/ref/modules/all/index.rst
- doc/ref/modules/index.rst
- salt/modules/systemd.py
- salt/modules/zypper.py
2016-04-11 11:33:08 -06:00
Nicole Thomas
29333e533e
Add documentation for some master/minion configs ( #32454 )
...
Refs #32400
Adds docs for:
- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
2016-04-11 10:49:52 -06:00
Erik Johnson
f9306347cc
Clarify the scope of the provider param in states.
2016-04-08 22:05:36 -05:00
Erik Johnson
af24c82ab0
Add documentation on virtual module provider overrides to the module docs
2016-04-08 22:01:14 -05:00
Erik Johnson
e7fa21438c
Add new doc pages to toctree
2016-04-08 21:59:21 -05:00
Erik Johnson
f0de1236ec
Move the tables of virtual modules to individual documentation pages
2016-04-08 21:58:11 -05:00
Nicole Thomas
c53efc3349
Update master config docs
2016-04-07 09:10:19 -06:00
rallytime
d7b4b8b081
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/configuration/master.rst
- doc/ref/configuration/minion.rst
- salt/config.py
2016-04-04 12:36:14 -06:00
rallytime
7e642b8381
Audit config.py default types and values - first sweep
...
- Updated standard types in VALID_OPTS dict where necessary
- Updated default values to match VALID_OPTS in DEFAULT_*_OPTS dicts
- Updated master/minion configuration reference docs to match changes
- Removed enumerate_proxy_minions value as it's not referenced anywhere in code
2016-03-31 13:50:51 -06:00
Jacob Hammons
ff8ca5ac2e
Replaces incorrect reference to master_alive_check
with master_alive_interval
in docs
2016-03-30 20:32:43 -06:00
Nicole Thomas
ab8b70d985
Merge pull request #32212 from rallytime/bp-32197
...
Back-port #32197 to 2015.8
2016-03-29 09:50:58 -06:00
Todd Wells
5fdd81ace9
documentation fix issue 31844
2016-03-29 09:11:29 -06:00
Todd Wells
abd432746c
documentation-fix-31931
2016-03-29 09:08:58 -06:00
rallytime
7554d0f42d
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- doc/ref/states/include.rst
- doc/topics/cloud/reactor.rst
- doc/topics/reactor/index.rst
- doc/topics/releases/2015.5.10.rst
- doc/topics/tutorials/states_pt5.rst
- doc/topics/windows/windows-package-manager.rst
- salt/config.py
- salt/modules/state.py
- salt/states/grains.py
- tests/integration/modules/sysmod.py
- tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Nicole Thomas
d5bb8f6372
Merge pull request #32098 from rallytime/bp-32083
...
Back-port #32083 to 2015.8
2016-03-23 15:49:01 -06:00
Jacob Hammons
8ec5d989ad
2015.8.8 release docs
2016-03-23 14:00:30 -06:00
Thomas Güttler
4a3a6629ce
"Fire Event Notifications" moved down
...
it is less important. "Requisites" is what the page is about.
2016-03-23 13:57:45 -06:00
Erik Johnson
1b97e4a3df
Improve state module docs, replace references to state.highstate/state.sls with state.apply
...
Resolves #32037 .
2016-03-21 22:56:17 -05:00
rallytime
1a1ce05186
Merge branch '2015.5' into '2015.8'
...
Conflicts:
- .testing.pylintrc
- salt/cloud/clouds/joyent.py
2016-03-15 12:34:57 -06:00
Seth House
cb72b19240
Fix outdated Jinja 'env' variable reference
2016-03-10 19:48:42 -07:00
Imran Iqbal
e4df5d9a55
Fix typo in example for section winrepo_dir_ng
2016-03-08 13:21:52 -07:00
Erik Johnson
0f175a4edf
salt.returners.sqlite3_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
f8664103b1
salt.returners.redis_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
0ea1b76c22
salt.returners.postgres_local_cache: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
d6d794b484
salt.returners.postgres: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
82750ab699
salt.returners.pgjsonb: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
d8f90f6578
salt.returners.odbc: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
a1957c3706
salt.returners.mysql: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
ef6aa5de1c
salt.returners.multi_returner: add no-op save_minions() func for API compatibility
2016-03-03 21:40:37 -06:00
Erik Johnson
5b4eb58d99
salt.returners.mongo_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
da1acbb8f2
salt.returners.mongo_future_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
c13bb6549c
salt.returners.memcache_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
4322ad9ef3
salt.returners.influxdb_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
1dd106183c
salt.returners.etcd_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
8e80535516
salt.returners.couchdb_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
44538dfced
salt.returners.cassandra_cql_return: add no-op save_minions() func for API compatibility
2016-03-03 21:40:36 -06:00
Erik Johnson
978b6cb32f
Add missing RST file for slsutil module
2016-03-03 21:40:36 -06:00
Denys Havrysh
aebc48163d
Remove trailing white spaces in documentation files
2016-03-01 17:36:23 +02:00
Jacob Hammons
748acab8b5
Fixed zeromq casing in transport settings
2016-02-25 09:38:41 -07:00