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

3236 Commits

Author SHA1 Message Date
Thomas S Hatch
de3a1ce283 Merge pull request #14690 from jacksontj/multi_syndic 
Multi syndic
 2014-08-06 20:53:39 -06:00
Pedro Algarvio
4f7a6919d9 Merge branch '2014.7' into develop 2014-08-07 00:11:45 +01:00
Pedro Algarvio
788685d723 Update 'doc/.tx/config' - Build #136 
http://cookingwithsalt.org/job/salt/job/transifex/136/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-08-06 19:08:58 +01:00
Thomas S Hatch
616e61f663 Merge pull request #14742 from steverweber/fix_stuff 
catch exceptions and fix some vars
 2014-08-06 11:58:00 -06:00
Mike Place
c176b3b452 Spelling fix 2014-08-06 09:22:25 -06:00
steve
bc3ade860c catch exceptions and fix some vars 2014-08-05 22:39:57 -04:00
Chris Rebert
100d831ca9 copyedit doc/topics/releases/2014.7.0.rst 2014-08-05 18:31:36 -07:00
Colton Myers
f0aba5f9db Merge branch '2014.7' into develop 2014-08-05 16:29:11 -06:00
David Boucha
7e7f07927d add links to 2014.1.10 installers 2014-08-05 16:02:09 -06:00
Colton Myers
13995afba0 Merge branch '2014.7' into develop 
Conflicts:
	doc/topics/releases/2014.7.0.rst
 2014-08-05 15:32:04 -06:00
Thomas S Hatch
0e93ad1f28 Add mod_aggregate to the release docs 2014-08-05 13:26:30 -06:00
Nitin Madhok
61eb4fb041 Fixing YAML state syntax 2014-08-04 21:32:38 -04:00
Joseph Hall
8a3cb618b2 Merge pull request #14727 from seegno/bugfix/multimaster-doc 
Add missing lines between the code block declaration and the body
 2014-08-04 17:55:00 -06:00
Alfredo Palhares
145670b459 Add missing lines between the code block declaration and the body 2014-08-05 00:40:18 +01:00
Daniel Wallace
45c13d621f document the usage of userdata for cloud-init 
closes #14643
 2014-08-04 11:25:20 -06:00
Thomas S Hatch
1bd88cab28 Merge pull request #14535 from steverweber/template_var 
add two vars to the templates slspath and tplpath
 2014-08-04 10:06:07 -06:00
Daniel Wallace
77eaca180a document the usage of userdata for cloud-init 
closes #14643
 2014-08-03 13:38:38 -05:00
Pedro Algarvio
905b9a18b7 Merge pull request #14686 from whiteinge/test-gh-order 
Couple o' documentation fixes
 2014-08-03 00:48:56 +01:00
Elias Probst
686236d650 Corrected typo (Verion → Version). 2014-08-03 00:46:44 +01:00
Elias Probst
7e5a9a7ed8
Corrected typo (Verion → Version). 2014-08-02 11:04:30 +02:00
Thomas Jackson
0ce353ddfb Add master_id to master docs 2014-08-01 16:38:22 -07:00
Colton Myers
0143275458 Merge branch '2014.7' into develop 2014-08-01 12:36:57 -06:00
Colton Myers
051e371fe8 Add release notes for 2014.1.10 2014-08-01 12:36:10 -06:00
Seth House
ab508cb9d3 Fix maxdepth TOC for Salt at Scale tutorials 2014-08-01 12:05:22 -06:00
Hung Nguyen Viet
415623a9c6 fix link scheme, default scheme is HTTPS, as used sample configs 
provided by the tut
 2014-08-01 15:56:58 +07:00
Evan Borgstrom
c892cfad8a Adding Pyobjects section to the release notes for 2014.7.0 2014-07-31 18:06:05 -05:00
Erik Johnson
b454e39953 Merge pull request #14663 from borgstrom/pyobjects-rel-note 
Adding Pyobjects section to the release notes for 2014.7.0
 2014-07-31 18:02:21 -05:00
Colton Myers
b8b533986a Merge branch '2014.7' into develop 2014-07-31 14:12:44 -06:00
Colton Myers
4e36743523 Add 2014.1.9 release notes 2014-07-31 14:12:25 -06:00
Evan Borgstrom
4a2575806d Adding Pyobjects section to the release notes for 2014.7.0 2014-07-31 10:26:46 -07:00
Colton Myers
9f7f02b3ac Merge branch '2014.7' into develop 2014-07-30 13:48:40 -06:00
Colton Myers
0406655519 Add release notes for 2014.1.8 2014-07-30 13:48:18 -06:00
rallytime
ea4b045944 Update docs for using salt-cloud on OSX to install curl-ca-bundle 2014-07-29 15:29:33 -06:00
Nitin Madhok
4f9349381e Fixing a broken link and formatting code block 2014-07-29 12:03:49 -04:00
steverweber
0b764c5b69 add two vars to the templates slspath and tplpath 2014-07-29 09:53:19 -04:00
Erik Johnson
1fdf8905a9 Merge branch '2014.7' into develop 2014-07-26 19:17:42 -05:00
Seth House
3164b2164e Added hashutil module to docs index 2014-07-25 20:06:54 -06:00
Chris Rebert
7c7986f63a spelling fixes in 2014.7.0 release notes 2014-07-25 17:32:23 -07:00
Thomas S Hatch
8e0d8a7b9f Merge branch '2014.7' into develop 2014-07-25 10:30:07 -06:00
Thomas S Hatch
14159615c8 Merge pull request #14268 from whiteinge/salt-runner-sync-async 
Add sync/async Runner calls & sync/async Wheel calls that all respect eauth
 2014-07-25 10:07:54 -06:00
Pedro Algarvio
4fa7d3ad64 Update 'doc/.tx/config' - Build #123 
http://cookingwithsalt.org/job/salt/job/transifex/123/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-25 15:57:15 +01:00
Seth House
a4cc496bc7 Renamed call_func to cmd for consistency; made compat alias 
Added WheelClient() documentation on the non-eauth cmd & async funcs.
 2014-07-24 16:08:30 -06:00
Seth House
7f147e1212 Added cmd_sync, cmd_async methods to WheelClient docs 2014-07-24 16:08:29 -06:00
Seth House
6e40307efc Document new cmd_sync, cmd_async RunnerClient methods 
Also de-emphasize the direct master_call method. Since master_call is
inconsistent between RunnerClient and WheelClient we should instead
present a single, consistent interface.
 2014-07-24 16:08:28 -06:00
Seth House
fed58155bc Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-24 16:04:39 -06:00
Seth House
6517e7f378 Added generated new module docs 2014-07-24 15:56:19 -06:00
Seth House
81af51bf50 Added new module docs 2014-07-24 15:28:11 -06:00
Ryan Lane
d9c70af2df Re-add listen/listen_in documentation 2014-07-24 11:19:38 -07:00
Thomas S Hatch
efe27a50b5 Merge branch '2014.7' into develop 2014-07-23 11:59:27 -06:00
rallytime
aaf85bf4ea Add versionadded to new redis modules 2014-07-23 11:43:37 -06:00