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
Jered Sutton
01dbf385ef
Adding random_master to reference and updating master_shuffle.
...
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
2016-01-02 23:49:08 -06:00
Thomas Jackson
f63c2d70a7
Rework minion return_retry_timer
...
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.
Cleanup of #27286
Fixes #28577
2015-11-06 18:05:45 -08:00
Colton Myers
7b75e4aed1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
2015-09-22 15:07:45 -06:00
Justin Findlay
3d28307a00
2014.7 -> 2014.7.0
2015-09-18 16:08:47 -06:00
Colton Myers
32f5345d7d
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
...
Conflicts:
conf/minion
doc/conf.py
salt/modules/file.py
2015-08-10 10:56:40 -06:00
Jacob Hammons
d220c83f77
master_finger configuration docs
...
switch a script to use https:// instead of http://
Refs #25751
2015-08-06 20:23:22 -06:00
Justin Findlay
7e121de907
Update minion.rst
2015-07-31 17:34:07 -06:00
Jacob Hammons
ac0a8ff711
Doc on using syndic with multimaster
2015-07-31 15:25:15 -06:00
Jacob Hammons
3f3db4bd8e
Additions for #24042
2015-07-30 15:43:21 -06:00
Jacob Hammons
db2129b199
Minor doc bug fixes
...
Refs #24042
Refs #25650
Refs #21296
Refs #23788
2015-07-30 14:39:15 -06:00
Mike Place
0dc28ad3e4
Return to str for master_type for 2015.5
2015-07-24 11:55:56 -06:00
Jeff Quast
e947d8ec5a
docfix: "cache_jobs: False" => grains_cache: False"
...
At the currently rendered anchor link: http://docs.saltstack.com/en/latest/ref/configuration/minion.html#grains-cache
We see the use of "cache_jobs" in the yaml example for the section describing "grains_cache"
2015-07-16 09:24:07 -06:00
Justin Findlay
44cb167744
adding sudo_user minion config docs
2015-06-30 03:10:56 -06:00
C. R. Oldham
90c73ff446
References to documentation.
2015-06-23 11:40:06 -06:00
Michael Steed
f92a769d35
Remove doc references to obsolete minion opt
2015-06-17 15:29:50 -06:00
Jacob Hammons
c7cdd416a2
Doc bug fixes
...
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
2015-06-12 11:23:52 -06:00
Jacob Hammons
d45c4ed11f
Bug fixes and build errors
...
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
2015-06-05 17:32:35 -06:00
Colton Myers
1fb84450f4
Merge pull request #23396 from basepi/merge-forward-2015.2
...
[2015.2] Merge forward from 2014.7 to 2015.2
2015-05-06 15:42:35 -06:00
Erik Johnson
d395565bf7
Update Lithium docstrings in 2015.2 branch
2015-05-06 09:27:40 -05:00
Colton Myers
fd09cdae6f
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/ssh/roster.rst
salt/client/ssh/__init__.py
salt/client/ssh/wrapper/__init__.py
salt/config.py
salt/modules/file.py
salt/runners/lxc.py
2015-05-05 16:26:39 -06:00
Colton Myers
cb69cd07de
Match the master config template in the master config reference
2015-05-04 15:05:21 -06:00
Colton Myers
91dd9dcbdc
Add ssh_minion_opts to master config ref
2015-05-04 15:00:28 -06:00
Steve Weber
97513b060a
include module_dirs
...
include module_dirs
2015-05-04 13:00:31 -04:00
Colton Myers
a18e017619
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/man/salt.1
doc/ref/cli/salt.rst
2015-04-24 10:07:48 -06:00
Justin
8486e17ab3
Added retry_dns to minion doc.
2015-04-23 15:33:59 -06:00
Thayne Harbaugh
6179839225
Improve documentation for nested nodegroup.
2015-04-09 01:43:18 -06:00
Corin Kochenower
911345dd1a
Add versionadded label for event_return
2015-04-07 14:15:03 -06:00
Thomas S Hatch
d2e4ac840d
Merge pull request #22212 from ckochenower/2015.2
...
Add detail for writing a returner
2015-03-31 15:15:52 -06:00
Corin Kochenower
f44e25715a
Add detail for writing a returner
2015-03-31 13:59:11 -06:00
Colton Myers
7ba2404cc9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
conf/master
conf/minion
doc/ref/configuration/master.rst
salt/loader.py
salt/minion.py
salt/modules/ssh.py
salt/output/nested.py
salt/utils/network.py
2015-03-25 09:28:04 -06:00
rallytime
73a0df18a8
There are 4 values, not 3.
2015-03-24 14:57:29 -06:00
rallytime
c98118eb55
Update pillar_source_merging_strategy config doc spacing
...
to match accross all config values
2015-03-24 14:56:09 -06:00
Thomas S Hatch
cc9d294fcd
Merge pull request #21569 from basepi/merge-forward-2015.2
...
Merge forward from 2014.7 to 2015.2
2015-03-12 13:36:39 -06:00
rallytime
0171f68600
Use the full version for a versionadded tag
2015-03-11 16:29:08 -06:00
Colton Myers
ebe7eeafd9
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/conf.py
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
salt/cloud/clouds/linode.py
salt/states/composer.py
salt/states/win_update.py
2015-03-11 15:14:56 -06:00
Elias Probst
bc9a30b7e9
Typo (rendered → renderer)
2015-03-11 21:15:32 +01:00
Seth House
049975a1ca
Added versionadded for ext_pillar_first
2015-03-11 11:53:59 -04:00
C. R. Oldham
00942f2060
Merge forward 2014.7->2015.2
2015-03-01 17:55:25 -07:00
Seth House
4d974d9676
Improved presence docs; added cross-references and localhost caveat
...
Closes #18436 .
2015-02-28 19:22:38 -07:00
rallytime
c65d9673a7
Merge branch '2014.7' into merge_forward_fifteen_second_try
...
Conflicts:
salt/states/file.py
2015-01-29 13:42:49 -07:00
Seth House
e3d29bf8ff
Fixed syntax error in log_granular_levels example
2015-01-27 20:14:53 -07:00
Thomas Jackson
da3ea213e9
Comma cleanup
2014-12-12 11:34:34 -08:00
Thomas Jackson
f268bb8b4b
Whitespace cleanup
2014-12-11 07:53:20 -08:00
Nitin Madhok
5d8ae4e32f
Fixing sphinx violations and errors
2014-11-18 02:53:40 -05:00
vs
692252f41b
Merge branch 'sreq_cache_option' into optional_sreq_caching
2014-10-23 15:55:26 +02:00
Thomas S Hatch
3cf0cfb61d
Merge branch '2014.7' into develop
2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69
Add further clarification that gitfs auth is pygit2-only
2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d
Merge branch '2014.7' forward into develop
...
Conflicts fixed.
Conflicts:
salt/loader.py
salt/returners/carbon_return.py
salt/returners/couchbase_return.py
salt/returners/couchdb_return.py
salt/returners/elasticsearch_return.py
salt/returners/local_cache.py
salt/returners/memcache_return.py
salt/returners/mongo_future_return.py
salt/returners/mongo_return.py
salt/returners/mysql.py
salt/returners/odbc.py
salt/returners/postgres.py
salt/returners/redis_return.py
salt/returners/smtp_return.py
salt/returners/sqlite3_return.py
salt/states/dockerio.py
salt/utils/minions.py
2014-10-19 18:21:19 +01:00
vs
2e1d3b07b8
add cache_sreqs option to minion documentation
2014-10-16 07:33:37 +02:00
