valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,697 Commits 24 Branches 182 Tags 341 MiB
f0009be6c2
Commit Graph

183 Commits

Author SHA1 Message Date
Thomas S Hatch
f0009be6c2 Merge branch '2014.7' into develop 2014-08-21 17:20:26 -06:00
Thomas S Hatch
2d47589c88 Merge pull request #15140 from terminalmage/pygit2-auth 
Add gitfs authentication support for pygit2>=0.20.3
 2014-08-21 15:03:35 -06:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Erik Johnson
c8be676577 Update gitfs documentation 
This adds all the new authentication options, and also moves most of the
usage examples into the gitfs walkthrough. The walkthrough has also
undergone considerable restructuring.
 2014-08-20 21:36:44 -05:00
Mike Place
94543fe68d Document seco range 
Per request in #15093
 2014-08-20 11:54:29 -06:00
Seth House
c9390ebb00 Merge pull request #14907 from cachedout/doc_master_proc 
Explain the number of master procs and worker_threads
 2014-08-11 18:26:23 -04:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop 
Conflicts:
	salt/states/win_update.py
 2014-08-11 18:23:44 -04:00
Mike Place
a352cc4521 Explain the number of master procs and worker_threads 
Refs #13819
 2014-08-11 16:09:02 -06:00
Nitin Madhok
7606bfd6cc Fixing more sphinx warnings and errors 2014-08-11 13:56:43 -04:00
Chris Rebert
75d28df71d Begone, "allows to" (sic) ! 2014-08-11 10:20:28 -07:00
Nitin Madhok
e7bea7cc87 Fixing sphinx Warnings and Errors 2014-08-11 10:20:15 -04:00
Jeff Schroeder
b0467e2265 Add version added for pillar_source_merging_strategy 
Some of my coworkers tried to use this feature and realized it isn't available. git tag --contains for the commit which adds it shows:

    $ git tag --contains 3b9891b1
    v2014.7
 2014-08-07 15:30:24 -05:00
Thomas S Hatch
de3a1ce283 Merge pull request #14690 from jacksontj/multi_syndic 
Multi syndic
 2014-08-06 20:53:39 -06:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
Thomas Jackson
0ce353ddfb Add master_id to master docs 2014-08-01 16:38:22 -07:00
rallytime
a8cd830d52 Change "Helium" to 2014.7.0 in affected docs 2014-07-15 16:53:29 -06:00
Volker Schwicking
3ca39de6d0 add settings for multimaster-pki 2014-07-15 12:10:18 +02:00
Volker Schwicking
f3d6c705ee add settings multimaster-pki 2014-07-15 12:09:52 +02:00
Thomas S Hatch
1577bf0fad Merge pull request #14178 from khrisrichardson/spelling 
add sphinx spelling extension. enforce en_US
 2014-07-14 15:43:33 -06:00
Colton Myers
08d7847e44 Add configuration file location for minion (and FreeBSD for master) 2014-07-14 12:22:27 -06:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Erik Johnson
2849950bce Docs cleanup 
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
 2014-07-13 11:02:33 -05:00
Erik Johnson
a61812ce6f Clean up new master_type feature docs 2014-06-09 11:05:10 -05:00
vs
4661938dd7 add shuffling to the minions master_type=failover functionality 2014-06-02 01:01:16 -07:00
vs
16269130e6 Merge remote-tracking branch 'upstream/develop' into minion_failover_master 
Conflicts:
	doc/ref/configuration/master.rst
 2014-05-30 12:14:19 -07:00
Thomas S Hatch
b8897a5b0d rename the sls renderer to the yamlex renderer 2014-05-30 09:28:20 -06:00
Thomas S Hatch
185eae31cd Merge branch 'serializers-migration' of https://github.com/johnnoone/salt into johnnoone-serializers-migration 
Conflicts:
	salt/pillar/__init__.py
 2014-05-30 09:16:21 -06:00
vs
f007cfecd5 add missing 's' 2014-05-30 08:04:08 -07:00
vs
f5009f06fa reworked master_type section 
added master being a list of servers

added master_type: failover
 2014-05-30 08:00:28 -07:00
vs
22d590a9cc added max_minions setting 2014-05-30 07:58:01 -07:00
vs
918502c8fe added section for 'presence_events' 2014-05-30 06:51:03 -07:00
Thomas S Hatch
125acd728c Clean up first person 2014-05-28 09:55:11 -06:00
root
448f3870af Added documentation on how to use master: module.function and master_type. 2014-05-28 08:20:41 -07:00
Erik Johnson
3bcfc735f8 Add dulwich to gitfs_provider docs 2014-05-21 15:00:19 -05:00
Erik Johnson
8d4370accc Fix indentation 
This brings the note about the gitfs walthrough outside of the YAML
code-block.
 2014-05-21 01:34:28 -05:00
Seth House
59f2d07ffb Bunch of misc rST fixes 2014-05-14 12:02:55 -06:00
Thomas S Hatch
a74828f437 Fixes for #12673 2014-05-13 11:32:28 -06:00
steverweber
84bfe9ce18 auto accept keys in minions_autosign 
Accept keyids if a file with the same name is found in minions_autosign.
Also option to check the datestamp of the file and only accept if within timeout.
 2014-05-12 19:56:39 -04:00
Chris Rebert
7d1df94bb1 copyedit ref docs 2014-04-30 14:08:31 -07:00
Wes Turner
6aa523d9d1 DOC: Update GitFS documentation (syntax, links) 2014-04-22 05:42:10 -05:00
Erik Johnson
910393fa3c Add new params to master config docs 
Also fixed up some of the wording on the other recently-added remote
fileserver configuration parameters.
 2014-04-11 11:40:01 -05:00
Xavier Barbosa
3b9891b1dc implement merging strategy into pillar 2014-04-09 06:45:11 +02:00
Erik Johnson
0f5160345b Add new params to master docs 2014-04-08 16:13:29 -05:00
Erik Johnson
ae11b2678a Add new minionfs params to docs 2014-04-07 11:29:24 -05:00
Johannes
1434539af7 Fix typo 2014-03-30 15:48:15 +00:00
Tim O'Guin
db6f276d01 added /var/run/salt to nonroot docs 2014-03-28 10:18:57 -05:00
Erik Johnson
5e1870d1c5 Add info on per-remote gitfs_base to master docs 2014-03-26 16:29:07 -05:00
Thomas S Hatch
21c4344f2e Clarify and update non-root documentation 2014-03-20 16:00:10 -06:00
Seth House
a06ccfef2f Added docs for the extension_modules setting 
Refs #11030
 2014-03-07 15:13:41 -08:00
Tarjei Husøy
aec6b11d9a Fix inconsistent header formatting in docs 2014-03-05 22:21:11 +01:00