Commit Graph

2865 Commits

Author SHA1 Message Date
Erik Johnson
38c1690310 Remove reference to nonexistant page 2014-06-09 11:06:06 -05:00
Erik Johnson
a61812ce6f Clean up new master_type feature docs 2014-06-09 11:05:10 -05:00
Erik Johnson
50bc3f7a2c Add aliyun to toctree 2014-06-09 11:04:31 -05:00
Pedro Algarvio
506cbe4726 Make use of the bootstrap.saltstack.com URL(s) 2014-06-07 13:59:39 +01:00
Pedro Algarvio
ecad55409a Update 'doc/.tx/config' - Build #75
http://cookingwithsalt.org/job/salt/job/transifex/75/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-06-06 23:09:16 +01:00
Joseph Hall
dcb3afdf5c Update formatting, point to profiles doc 2014-06-06 13:55:51 -06:00
Joseph Hall
755739146f Explain and remove script examples from profiles 2014-06-06 13:47:28 -06:00
Joseph Hall
a65ad31ddf Fix copy/paste errors in cloud.profile docs 2014-06-06 13:42:49 -06:00
Joseph Lorenzini
b4e6d3b687 Merge remote-tracking branch 'salt/develop' into develop 2014-06-06 13:07:29 -05:00
Joseph Lorenzini
07e6c2ad5c removed tab characters from topic 2014-06-06 13:05:40 -05:00
Joseph Hall
03e8ad7f7e Merge pull request #13283 from Mutantjessica/develop
Proofread doc/topics/tutorials/firewall.rst
2014-06-05 21:58:06 -06:00
Jessica Wilson
1c5aac833e Minor typo fix 2014-06-06 02:20:07 +00:00
Joseph Lorenzini
55f710d1af Merge remote-tracking branch 'salt/develop' into develop 2014-06-05 20:49:29 -05:00
Joseph Lorenzini
c25b58a0ea fixed minor typo in openstack topic 2014-06-05 20:44:35 -05:00
Joseph Lorenzini
bce3df7a63 added content to cloud provider section for openstack 2014-06-05 20:36:37 -05:00
Stuart Jansen
b4e9405cf4 fix yaml errors in cloud map documentation 2014-06-05 19:34:13 -06:00
Thomas S Hatch
6e6a8dbebf Merge pull request #13271 from basepi/yamlindentation
Clarify yaml indentation issues, and add another example
2014-06-05 17:33:28 -06:00
Colton Myers
3c3bc18068 Clarify yaml indentation issues, and add another example 2014-06-05 17:20:53 -06:00
Colton Myers
426ebcbc4d More requisite doc cleanup 2014-06-05 16:24:59 -06:00
Thomas S Hatch
fb5924070f Merge pull request #13143 from felskrone/minion_failover_master
Minion failover master
2014-06-05 14:41:27 -06:00
e1337h4xx
389a7677b0 Update debian.rst
Added jessie to saltstack debian installation docs
2014-06-05 22:01:53 +02:00
Seth House
63dc40bd06 Added entry to docs Makefile and Sphinx config to build PDF usinx XeTeX
We have a few unicode chars in the docs now. Plus this should be a good
change for future non-English builds of the docs.
2014-06-04 17:44:10 -06:00
Colton Myers
5938016c85 Small clarification fix 2014-06-04 16:11:29 -06:00
Colton Myers
cd6617107e Revamp the `watch` requisite docs 2014-06-04 16:01:28 -06:00
Colton Myers
43c26360ee Use correct case for requisites (even in titles) 2014-06-04 15:48:00 -06:00
Joseph Lorenzini
e13b2e3dc3 in openstack topic, appended tokes the auth url which the driver requires. Auth failure occurs without it. 2014-06-03 14:02:09 -05:00
Thomas S Hatch
aad9140cf8 Merge pull request #13196 from terminalmage/docs
Clarify installation of GitPython
2014-06-03 11:09:37 -06:00
Thomas S Hatch
4979ae7b1d Merge pull request #13167 from terminalmage/varnish-cleanup
Cleanup new varnish module and add to docs
2014-06-03 11:00:03 -06:00
Erik Johnson
dcaf2892f3 Clarify GitPython installation in gitfs tutorial 2014-06-03 10:40:27 -05:00
Erik Johnson
2c3789c394 Add varnish module to docs 2014-06-02 11:27:09 -05:00
Joseph Hall
e0b2428f5a Add new postfix module 2014-06-02 10:20:58 -06:00
vs
4661938dd7 add shuffling to the minions master_type=failover functionality 2014-06-02 01:01:16 -07:00
Pedro Algarvio
d843102cad Update 'doc/.tx/config' - Build #69
http://cookingwithsalt.org/job/salt/job/transifex/69/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-06-01 00:53:00 +01: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
bVector
198859c44f Typo correction 2014-05-30 10:56:54 -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
Joseph Hall
b13f8ad2d3 Merge pull request #13131 from felskrone/minions_present_docu
added section for 'presence_events'
2014-05-30 08:29:54 -06:00
vs
918502c8fe added section for 'presence_events' 2014-05-30 06:51:03 -07:00
rallytime
153e71c76b Minor changes to integration test docs 2014-05-29 08:56:58 -06:00
Erik Johnson
5069168381 Merge pull request #13098 from s0undt3ch/develop
Remove remaining `exsel` code
2014-05-29 08:51:10 -05:00
Pedro Algarvio
35599ab277 Update 'doc/.tx/config' - Build #66
http://cookingwithsalt.org/job/salt/job/transifex/66/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
2014-05-29 01:42:01 +01:00
Pedro Algarvio
7bd8b1360f Remove remaining exsel code 2014-05-29 01:32:54 +01:00
Thomas S Hatch
f06e4de247 Merge pull request #13083 from rallytime/test_docs
More testing documentation improvements
2014-05-28 13:41:36 -06:00
rallytime
24d41b0212 More testing documentation improvements 2014-05-28 13:29:20 -06:00
Thomas S Hatch
125acd728c Clean up first person 2014-05-28 09:55:11 -06:00
Thomas S Hatch
b920a9b230 Merge pull request #13039 from felskrone/master_from_module
Master from module
2014-05-28 09:41:54 -06:00