Commit Graph

15 Commits

Author SHA1 Message Date
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
rallytime
02bfe7912c Remove more ":doc:" references from doc/* files 2016-12-15 15:36:44 -07:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/minion.py
  - salt/states/user.py
2016-04-15 13:58:50 -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
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
2015-12-18 15:00:24 -07:00
Colton Myers
2405501d75 Add documentation for tcp ipc_mode and multi-master 2015-12-17 14:08:41 -07:00
Dmitry Kuzmenko
7a5204ef02 Deprecate client_acl with publisher_acl (rename)
Keeping client_acl support
2015-10-23 11:59:40 +03:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas Jackson
c18e834be1 Fix trailing whitespace
Conflicts:
	doc/topics/tutorials/states_pt2.rst
2014-12-11 07:53:19 -08:00
Mike Place
3767666ccb Note the presence of master_alive_interval in MM docs.
Refs #14906
2014-10-23 11:47:00 -06:00
rallytime
e5a1876462 Update multimaster tutorial 2014-09-04 12:58:19 -06:00
vs
b1142570bc add note that points to multimaster_pki as an alternative setup 2014-07-15 03:42:39 -07:00
Erik Johnson
9c63495e04 Formatting fixes
This completes the documentation audit begun in cf365f7, using proper
backticks and :strong: tags to emphasize text, converting groups of
shell commands to bash code-block sections, etc. This also replaces the
use of \* with the easier-to-grok '*', which will hopefully reduce
confusion among new users.
2013-08-11 22:17:47 -05:00
Chris Rebert
6a5ff56426 copyediting and formatting 2013-06-18 15:01:57 -07:00
Thomas S Hatch
28d93ab426 Add multi master tutorial 2013-06-18 01:53:35 -06:00