valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
35,281 Commits 24 Branches 182 Tags 341 MiB
91de660025
Commit Graph

3277 Commits

Author SHA1 Message Date
Thomas S Hatch
4eccf705cb Merge pull request #13905 from s0undt3ch/hotfix/transifex-updates 
Update 'doc/.tx/config' - Build #99
 2014-07-02 10:17:51 -06:00
Volker Schwicking
4c2949a267 formatting improvements, little text rework 2014-07-02 14:32:19 +02:00
Volker Schwicking
4099a9d5fc formatting improvements, little text rework 2014-07-02 14:31:49 +02:00
Volker Schwicking
14a0441dec formatting improvements, little text rework 2014-07-02 14:29:35 +02:00
Volker Schwicking
06baca4cf5 formatting codeblocks etc. 2014-07-02 13:51:47 +02:00
Volker Schwicking
e7838c3641 formatting and text reworks 2014-07-02 13:44:50 +02:00
Volker Schwicking
2e8e00f879 fix note to display as note 2014-07-02 12:44:52 +02:00
Volker Schwicking
b086f8d2c7 fixed to 80 chars in width 2014-07-02 12:39:58 +02:00
vs
e9796459fb first draft of multimaster pki tutorial 2014-07-02 02:52:19 -07:00
Erik Johnson
1b9660a40a Fix 2nd person 2014-07-01 23:42:03 -05:00
Seth House
030035e1ff Run xelatex three times to catch the TOC 2014-07-01 19:10:46 -06:00
Pedro Algarvio
1eea61aeaa Update 'doc/.tx/config' - Build #99 
http://cookingwithsalt.org/job/salt/job/transifex/99/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-07-02 00:47:44 +01:00
rallytime
6caff78b18 Remove random :'s 2014-07-01 15:11:51 -06:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Thomas S Hatch
1cd95aa0c8 Revert "Sign the masters pub-key" 2014-06-30 15:04:53 -06:00
Thomas S Hatch
eda36a01a3 Merge pull request #13570 from felskrone/sign_master_keys 
Sign the masters pub-key
 2014-06-30 15:04:23 -06:00
Colton Myers
e1445e5cf7 Merge pull request #13852 from basepi/2014.1.6releasenotes 
Add two fixes to release notes for 2014.1.6
 2014-06-30 14:50:55 -06:00
Colton Myers
30efb97b30 Add two fixes to release notes 2014-06-30 14:50:24 -06:00
Seth House
918f12a376 Added roster modules to the documentation 2014-06-30 14:01:48 -06:00
Erik Johnson
06abbb02c7 Add rh_service bugfixes to 2014.1.6 release notes 2014-06-30 13:50:53 -05:00
Forrest Alvarez
55916e8a7b Update best_practices doc for code block issues. 2014-06-29 00:37:29 +00:00
Erik Johnson
b4a5f7c1bb Use code-block instead of double-colon + indent 
The new sphinx style assumes that indented examples preceded by a
double-colon are python. This changes he main walkthrough page so it
uses a bash code-block in these areas, to be more accurate.
 2014-06-28 14:35:21 -05:00
Seth House
afde747f46 Merge pull request #13817 from rallytime/cloud_extends_docs 
Clarify cloud configuration extends behaviors
 2014-06-27 19:03:26 -06:00
rallytime
0636f2cb77 Clarify list merging and non-recursive behaviors of extends in cloud.config 2014-06-27 18:55:52 -06:00
Seth House
7725350416 Merge pull request #13811 from lyft/doc-additions 
Add docs for boto_elasticache and apache_module
 2014-06-27 17:10:10 -06:00
Thomas S Hatch
0a611598e6 Merge pull request #13803 from claytron/version-numbers 
Clarify version numbering scheme
 2014-06-27 13:23:07 -06:00
Clayton Parker
dfec35fe47 fix error on make clean with no translations 2014-06-27 13:45:39 -04:00
Clayton Parker
33e6cd6191 clarify the version numbering scheme 2014-06-27 13:45:13 -04:00
Joseph Hall
9b5a6d575e Merge pull request #13790 from danielrowles-wf/ec2-secondary-ip-addresses 
Add support for adding secondary IP addresses to network interfaces
 2014-06-27 07:26:15 -06:00
vs
cfa163d4fb Merge remote-tracking branch 'upstream/develop' into sign_master_keys 2014-06-27 03:52:30 -07:00
Mike Place
c255b4ad13 Update glossary.rst 
Re-word external pillar
 2014-06-26 16:41:33 -06:00
Mike Place
0a42bf0678 External pillar glossary entry 2014-06-26 16:20:11 -06:00
Mike Place
126e84a081 Glossary entry for master tops 2014-06-26 16:13:57 -06:00
Mike Place
2c27cc1a34 Add __virtual__ to glossary 2014-06-26 16:07:30 -06:00
Dan Rowles
329351313a Add support for adding secondary IP addresses to network interfaces 
when provisioning EC2 instances with salt-cloud.
 2014-06-26 20:29:15 +00:00
rallytime
7778a6e24d clarifications to gce cloud docs 2014-06-26 11:31:52 -06:00
Mike Place
22d2e812ef Merge pull request #13751 from claytron/doc-fixes 
fix errors in docs
 2014-06-25 21:28:35 -06:00
Clayton Parker
23c494c8ce fix errors in docs 2014-06-25 22:54:37 -04:00
Colton Myers
f53e3b4a54 Add 2014.1.6 release notes 2014-06-25 15:05:44 -06:00
Joseph Hall
337f03bb3d Merge pull request #13737 from christabor/syntax-labels 
Add a fix for long lines.
 2014-06-25 14:03:51 -06:00
Christobot
a7d62f5b8f Add a fix for long lines. Fixes #13724 2014-06-25 12:57:09 -07:00
vs
f54b90b07c pylinting, better log messages, docstrings, no logic changes 2014-06-25 06:26:01 -07:00
Thomas S Hatch
d5504945e8 Merge pull request #13718 from christabor/syntax-labels 
Add new styles for code blocks
 2014-06-25 00:08:48 -06:00
christobot
9786fe45d6 Add new styles for code blocks - addresses #13215 2014-06-24 22:30:09 -07:00
Thomas S Hatch
caf8c4094a Merge pull request #13701 from cachedout/pillar_doc_brushup 
Improve initial pillar doc
 2014-06-24 21:30:49 -06:00
Thomas S Hatch
22c3588c24 Merge pull request #13689 from rallytime/digital_ocean_docs 
Update Digital Ocean docs to include ssh_key_file requirements
 2014-06-24 21:24:23 -06:00
Mike Place
915570f045 Formalize a policy for initializing dictionaries. 2014-06-24 18:35:13 -06:00
Mike Place
e01becc217 Improve initial pillar doc 
I think the pillar intro was too light on details. Hopefully this makes
it easier to follow.
 2014-06-24 16:47:45 -06:00
rallytime
c482bf2e6c Update "Getting Started with Digital Ocean" docs to include ssh requirements 2014-06-24 14:47:00 -06:00
Daniel Wallace
4d8d2fa377 Document match for overstates 
Uses compound matching. Closes #13659
 2014-06-23 19:19:47 -05:00
Henrik Holmboe
e0a6a5a13e Reflect the latest released version 
I did this exact PR in #12695 the last time around. Luckily #12720 seems to take a stab at automating this. :)
 2014-06-23 19:56:39 +02:00
Pedro Algarvio
1f0e0d4465 Remove doc/man/salt-api.7 2014-06-21 19:00:55 +01:00
Pedro Algarvio
99dfb00805 Update 'doc/.tx/config' - Build #88 
http://cookingwithsalt.org/job/salt/job/transifex/88/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-06-21 13:36:03 +01:00
Thomas Jackson
c721d9d664 Seperate saltnado_websockets from the rest of the implementation. 2014-06-20 15:10:56 -07:00
Seth House
d2f82c8bba Removed incorrect TOC syntax from netapi index 2014-06-20 10:21:18 -06:00
Seth House
acb203c735 Added salt-api to CLI TOC 2014-06-20 10:20:58 -06:00
Seth House
c9579866e4 Make mention of salt-api in the netapi modules links 
People will be searching for this term.
 2014-06-20 10:17:15 -06:00
Joseph Hall
2fad262ced Merge pull request #13581 from basepi/releasecherrypick 
Add some notes about cherry-picking
 2014-06-20 06:33:48 -06:00
Colton Myers
df7ef6f504 Fix typo 2014-06-19 16:19:20 -06:00
Colton Myers
a41b4107ea Add some notes about cherry-picking 2014-06-19 16:17:46 -06:00
Seth House
8f5e336a16 Added link to the writing netapi modules doc 2014-06-19 13:22:57 -06:00
Seth House
14f663f37e Added link to legacy salt-api release notes 2014-06-19 13:20:05 -06:00
Seth House
9f93aaf016 Renamed old autodoc-generated salt-api netapi module filenames 2014-06-19 13:19:24 -06:00
Seth House
d4f64e8d5d Disable the 'routing table' index from the httpdomain 
While very cool and quite handy, it doesn't make sense for how we use
netapi modules in Salt.
 2014-06-19 13:13:09 -06:00
Seth House
6d09e554e4 Fixed two straggling occurances of APIClient -> NetapiClient 2014-06-19 13:02:16 -06:00
Seth House
cbc3775fbc Remove the sphinxcontrib from the import path 
I swear I fixed this during the merge. Must have undone the change
somehow.
 2014-06-19 12:27:31 -06:00
Thomas S Hatch
b6cc31e8af Merge pull request #13554 from whiteinge/saltapi-merge 
salt-api merge!
 2014-06-19 11:44:52 -06:00
Pedro Algarvio
1a9a7fb87e Merge branch 'develop' of github.com:saltstack/salt into hotfix/saltapi-merge-tests 2014-06-19 12:01:33 +01:00
Ronan Amicel
77dfa9eff4 Docs: fix list formatting on the Installation page 2014-06-19 11:56:28 +02:00
Thomas S Hatch
060f34f746 Merge pull request #13526 from s0undt3ch/hotfix/setup-raet 
simpler requirements setup
 2014-06-18 23:55:01 -06:00
Nitin Madhok
2e27b9d1df Fixed typo 2014-06-19 01:40:39 -04:00
Seth House
295e0b9060 Temporarily commented out docs Mock decorator conditional 
This worked in the smaller salt-api project but is choking somewhere in
the larger Salt project. We do need this but we need the salt-api merge
sooner. Commented out for now.
 2014-06-18 23:20:27 -06:00
Seth House
061a43b6f3 Added netapi docs to TOC 2014-06-18 23:19:45 -06:00
Seth House
8df1bbf1d1 Added missing functools import 2014-06-18 23:05:26 -06:00
Seth House
ae413133f3 Added netapi modules to the module index 2014-06-18 23:04:45 -06:00
Seth House
7b6544c660 Added httpdomain from Sphinx-contrib 2014-06-18 22:14:17 -06:00
Seth House
53bab586f4 Merged salt-api into Salt 
Woot!

The conflicts below are intentional because they contained salt-api-isms
that needed to be included into the corresponding Salt files.

Conflicts:
	debian/changelog
	debian/control
	doc/conf.py
	doc/index.rst
	opt_requirements.txt
	salt/config.py
	salt/loader.py
 2014-06-18 22:13:56 -06:00
Seth House
1d4057fadf Updated all saltapi import paths to salt.netapi 2014-06-18 20:56:16 -06:00
Seth House
6f112d6eef Updated the netapi modules index to be more clear 2014-06-18 20:19:03 -06:00
Seth House
554a612aa4 Renamed netapis to netapi 2014-06-18 20:05:02 -06:00
Seth House
cf4b684edb Moved salt-api release notes into saltapi subdir 2014-06-18 20:03:40 -06:00
Seth House
598a1d74a3 Removed redundant docs files with Salt-core docs 2014-06-18 20:02:16 -06:00
Seth House
d01462cb28 Retain docstring if mocked object is used as a decorator 
This prevents mocked objects that are used as decorators from obscuring
the docstring of the decorated function/method.
 2014-06-18 15:28:20 -06:00
Seth House
de3e1d31ce Removed mocks for unused libraries 
These mocks were all for legacy code.
 2014-06-18 15:28:20 -06:00
Colton Myers
6cb859b6da Merge pull request #13394 from basepi/2014.1.5release 
Add release notes for 2014.1.5 and bump docs version
 2014-06-18 10:27:59 -06:00
Thomas S Hatch
7b1950b803 Merge pull request #13468 from techhat/db 
Add sdb loader type
 2014-06-18 10:04:29 -06:00
Seth House
704c889066 Added local TOC for the rest_cherrypy URL list 2014-06-17 21:38:13 -06:00
Seth House
13e89c6ac6 Merge pull request #158 from pass-by-value/websocket_tornado 
Websocket tornado
 2014-06-17 21:07:28 -06:00
Pedro Algarvio
33b1532239 Remove ending install 2014-06-18 00:46:59 +01:00
Pedro Algarvio
acf51004f8 Update documentation accordingly 2014-06-18 00:36:35 +01:00
Erik Johnson
a1f5be53dc Remove pillar page from targeting toctree 2014-06-17 17:23:31 -05:00
Erik Johnson
5688da134d Remove pillar targeting page 
There is already a section for this in the Pillar page, no need for a
dedicated page.
 2014-06-17 17:21:22 -05:00
Erik Johnson
0f7c91b9e0 Add external ref target for pillar targeting 2014-06-17 17:20:50 -05:00
Erik Johnson
d7abba149a Add new targeting pages to docs index 
Also, change the index pages to use external refs instead of the :doc:
role.
 2014-06-17 17:20:50 -05:00
Erik Johnson
2a5698b6ab Add external ref target for batching page 2014-06-17 17:20:50 -05:00
Erik Johnson
3a61446f06 Add new pages to targeting toctree 2014-06-17 17:20:49 -05:00
Erik Johnson
40d96af27c Add new docs pages for pillar and ipcidr matchers 2014-06-17 17:20:49 -05:00
Christobot
3d4484d24a Fixed css fonts: 
The path was referenced after the css macro, and the css font names have
changed as well. I update all the weights and styles and fixed some
formatting/indenting issues
 2014-06-17 13:39:31 -07:00
Thomas S Hatch
b40757950c Merge pull request #13505 from s0undt3ch/hotfix/setup-raet 
Differentiate ZeroMQ from RAET based installations
 2014-06-17 13:53:43 -06:00
Erik Johnson
1a4e1c7944 Remove italics 
These are out-of-place in the context of the other steps in this
particular section, and thus unnecessary.
 2014-06-17 14:47:19 -05:00
Seth House
68904637a5 Merge pull request #13509 from bechtoldt/foreman_pillar_doc 
trying to add foreman pillar module to documentation, refs #13481
 2014-06-17 13:17:57 -06:00
Joseph Hall
36cf034f67 Add docs on writing SDB modules 2014-06-17 11:41:54 -06:00
Joseph Hall
b915488294 Mark SDB as experimental 2014-06-17 11:41:54 -06:00
Joseph Hall
7ec89b7658 Rename db doc dir to sdb 2014-06-17 11:41:54 -06:00
Joseph Hall
aff6e4da20 Fix typos in SDB docs 2014-06-17 11:41:54 -06:00
Joseph Hall
69f1a83dbe Initial documentation for SDB loader 2014-06-17 11:41:54 -06:00
Arnold Bechtoldt
9a5ce71286 trying to add foreman pillar module to documentation, refs #13481 2014-06-17 19:24:27 +02:00
Pedro Algarvio
4ba108a0d7 Also provide a pip example on how to pass the global variable 2014-06-17 16:01:11 +01:00
Pedro Algarvio
a2c8175181 Document the --salt-transport option 2014-06-17 15:53:29 +01:00
Pedro Algarvio
85427e73d7 Update install documentation to reflect RAET deps 2014-06-17 15:36:02 +01:00
Erik Johnson
72711727b3 remove 2nd person pronoun 2014-06-16 21:19:32 -05:00
Erik Johnson
f915de5784 Add reminder about firewall to salt-cloud troubleshooting page 2014-06-16 17:29:08 -05:00
Seth House
d80a5c4886 Added salt-cloud events to the event list 2014-06-13 23:23:55 -06:00
Seth House
28b0e1f904 Linked training graphic 2014-06-13 17:05:24 -06:00
Thomas S Hatch
bf7d7cdc61 Merge pull request #13451 from rallytime/grains_docs 
Added note about grain lowercase resolution
 2014-06-13 16:58:35 -06:00
Seth House
5b8a601c30 Removed links to old training classes from sidebar 2014-06-13 16:27:49 -06:00
rallytime
1612be139f Added note about grain lowercase resolution 2014-06-13 16:03:38 -06:00
Pedro Algarvio
c1a954467b Update 'doc/.tx/config' - Build #80 
http://cookingwithsalt.org/job/salt/job/transifex/80/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-06-13 01:20:37 +01:00
David Boucha
b54068c57d document new windows installers 2014-06-12 15:36:05 -06:00
Ryan Lane
bffc4f1fb4 Add missing generated rst 2014-06-11 18:18:31 -07:00
Erik Johnson
ee0d14d989 Add new module/state to toctree 2014-06-11 18:06:12 -05:00
Ryan Lane
16c83d24bf Add docs for boto_elasticache and apache_module 2014-06-11 15:52:31 -07:00
Erik Johnson
5db13960b1 Add links to targeting pages 2014-06-11 16:19:24 -05:00
Colton Myers
51aefc9389 Add release notes for 2014.1.5 and bump docs version 2014-06-11 12:03:31 -06:00
rallytime
cd91d4c9cc Added expensiveTest documentation to cloud testing docs 2014-06-11 11:17:27 -06:00
Pedro Algarvio
8ae3268037 Merge pull request #13339 from rallytime/cloud_tests 
Cloud tests
 2014-06-10 19:16:42 +01:00
rallytime
ce43e04769 change cloud docs to reflect runtest changes 2014-06-10 10:32:38 -06:00
Seth House
679f74198e Added link target for the module sync system 2014-06-09 19:31:38 -06:00
rallytime
35155cc587 Documentation for cloud provider integration tests 2014-06-09 14:49:50 -06:00
Thomas S Hatch
0792e20d6c Merge pull request #13331 from terminalmage/fix-docs-build-errors 
Fix docs build errors
 2014-06-09 13:26:05 -06:00
Erik Johnson
a628a178cb Fix underline length mismatch 2014-06-09 11:07:53 -05:00
Erik Johnson
231aa4c5af Add target text for link 2014-06-09 11:07:17 -05:00
Erik Johnson
126c97a008 Alphabetically sort list of clouds 2014-06-09 11:06:32 -05:00
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
Erik Johnson
cf7f06f8f9 Remove duplicate word 2014-06-09 01:49:09 -05:00
Erik Johnson
3ca776a167 Add reactor example for syncing custom types on initial highstate 2014-06-07 14:27:26 -05:00
Pedro Algarvio
506cbe4726 Make use of the bootstrap.saltstack.com URL(s) 2014-06-07 13:59:39 +01:00
vs
db3b5207cb rewrite a few sentences, re-ordering, etc. 2014-06-06 23:55:25 -07: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
Aditya Kulkarni
02d5c00358 Add docs 2014-06-05 10:12:00 -04:00
vs
d28a4bc9d5 fix link 2014-06-05 06:04:56 -07:00
vs
864262b1a5 remove all you's and rewrite some sentences 2014-06-05 06:02:58 -07:00
vs
0ebaccb996 highlight topics 2014-06-05 04:00:29 -07:00
vs
c864203bc7 put infos into a note box 2014-06-05 03:54:10 -07:00
vs
bf3ba5cf4d added links to two auth-loop issues 2014-06-05 02:00:31 -07:00
vs
45ab2130f5 link test2 2014-06-05 01:58:01 -07:00
vs
66ac607597 url test2 2014-06-05 01:53:49 -07:00
vs
2c51909d7b url test 2014-06-05 01:45:34 -07:00
vs
328e6478aa "using salt at scale" tutorial for the docs 2014-06-05 01:36:46 -07: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
Aditya Kulkarni
64ed4a309b Add websocket support 2014-06-03 15:04:23 -04: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
root
448f3870af Added documentation on how to use master: module.function and master_type. 2014-05-28 08:20:41 -07:00
Pedro Algarvio
be672693d3 Update 'doc/.tx/config' - Build #65 
http://cookingwithsalt.org/job/salt/job/transifex/65/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-05-28 00:26:34 +01:00
Thomas S Hatch
3bccdbdef6 Merge pull request #13058 from rallytime/test_docs 
Improvements to general and integration testing docs
 2014-05-27 16:38:04 -06:00
Thomas S Hatch
2885907854 Merge pull request #13051 from gtmanfred/onlyif 
Add documentation on altering states.
 2014-05-27 16:18:57 -06:00
rallytime
6610e08ebf Improvements to general and integration testing docs 2014-05-27 15:59:30 -06:00
Daniel Wallace
a31ed6b1c7 ref to altering_states 2014-05-27 16:51:09 -05:00
Seth House
39a98e0aba Added link target for the requisites doc 2014-05-27 14:20:27 -06:00
Daniel Wallace
f393569c44 add Helium note 2014-05-27 13:55:31 -05:00
Daniel Wallace
b767d340ee Add documentation on altering states. 2014-05-27 13:14:42 -05:00
Henrik Holmboe
e1b498b523 Fix Release Notes for 0.17.4 
It appears that the list of issues fixed in Release Notes for 0.17.4 is
a straight copy of 0.17.3. A `git diff v0.17.3..v0.17.4` and a little
annotate later turned up these fixed issues instead.
 2014-05-27 19:19:42 +02:00
Pedro Algarvio
4d7ca91424 Remove unnecessary ©️ and :license: from file headers 2014-05-26 19:26:15 +01:00
Joseph Hall
680660cca3 Merge pull request #13025 from MTecknology/develop 
minor doc touchups
 2014-05-25 06:31:46 -06:00
Joseph Hall
84efdcff1c Merge pull request #13024 from richierichrawr/develop 
Update copyright
 2014-05-25 06:30:26 -06:00
richierichrawr
ff27a48f3a Update copyright 
2013-2014
 2014-05-25 02:40:41 -04:00
Michael Lustfield
5eab3db366 minor doc touchups 2014-05-24 23:42:00 -05:00
richierichrawr
d4be297d2e Update copyright 
Expired year
 2014-05-24 22:40:10 -04:00
Joseph Hall
a4701ac4e9 Merge pull request #13017 from crook/aliyun 
Add document for aliyun provider
 2014-05-24 07:59:43 -06:00
Ray Chen
5ecfcad6a1 Forget to submit these files for aliyun documents 2014-05-24 15:38:14 +08:00
Ray Chen
b15c7306b3 Add document for aliyun provider 2014-05-24 15:32:50 +08:00
Thomas S Hatch
1d75cf0fd2 Merge pull request #13005 from rallytime/salting_master_docs 
Documentation for salting the salt master
 2014-05-23 14:23:06 -06:00
rallytime
76340a5c62 Documentation for salting the salt master 2014-05-23 13:50:08 -06:00
Joseph Hall
b1c1d88d55 Remove docs which describe unintentional behavior 2014-05-23 13:29:46 -06:00
Joseph Hall
4ad99d822c Rewrite syndic topology for clarification 2014-05-23 13:16:51 -06:00
Colton Myers
a7741e61a3 Clarify some syndic points 2014-05-23 10:15:59 -06:00
Michael Lustfield
290cc87163 Adjusted wording and point of view. 2014-05-23 08:29:01 -05:00
Michael Lustfield
bb91f7b428 Added more information about how salt-syndic works. 2014-05-22 23:20:31 -05:00
Seth House
978e505b5f Updated Google Analytics tracking code 2014-05-22 16:56:02 -06:00
Seth House
a4abb798db Minor rST indentatation fixes to the Windows install docs 2014-05-22 12:00:54 -06:00
Pedro Algarvio
a713b64eb1 Update 'doc/.tx/config' - Build #59 
http://cookingwithsalt.org/job/salt/job/transifex/59/

Signed-off-by: Pedro Algarvio <pedro@algarvio.me>
 2014-05-22 14:05:01 +01:00
Seth House
e150b9fc61 Added missing versionadded to onchanges requisite 
Thanks to agronholm on IRC.
 2014-05-21 18:46:35 -06:00
Seth House
91fee80062 Revert "Revert "Removed links to Dash docs until feeds are fixed"" 
This reverts commit fd59d9df39.

Refs #5839

Conflicts:
	doc/index.rst
 2014-05-21 18:14:50 -06:00
Erik Johnson
5cd4000862 Add information on gitfs_provider to gitfs walkthrough 2014-05-21 15:00:29 -05:00
Erik Johnson
3bcfc735f8 Add dulwich to gitfs_provider docs 2014-05-21 15:00:19 -05:00
Joseph Hall
e50ac752ec Merge pull request #12930 from whiteinge/doc-salt-doc 
Doc salt doc
 2014-05-21 07:41:23 -06:00
Joseph Hall
46e526cf66 Merge pull request #12924 from gtmanfred/cloud 
Include salt cloud modules configurations from pillars
 2014-05-21 06:12:23 -06:00
Erik Johnson
93245d1e0e Correct inaccuracies in gitfs walkthrough 
Also, added some information on upcoming features
 2014-05-21 01:35:00 -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
8a3cce4620 Added documentation on how to write Salt documentation 
Closes #12792
 2014-05-20 23:50:52 -06:00
Seth House
64b8fb6a81 Added label to the docs for writing execution modules 2014-05-20 23:30:02 -06:00
Forrest Alvarez
b588393a7b Updated the quickstart so we can get rid of the standalone minion docs. 2014-05-21 03:33:09 +00:00
Forrest Alvarez
8c8060e6ea Updated the troubleshooting index with some link fixes for 12791. 2014-05-21 02:42:12 +00:00
Daniel Wallace
9bfdb1de72 We use cloud instead of clouds everywhere else 2014-05-20 18:32:19 -05:00
Daniel Wallace
19e791f31d space pillar data better 2014-05-20 17:59:36 -05:00
Daniel Wallace
4d54796c3c Document using Pillars for cloud config 2014-05-20 17:56:48 -05:00
Ryan Lane
92f21c7b05 Adding boto_* modules and states to documentation. 2014-05-20 18:06:17 -04:00
Seth House
7d484dc86a Restore trackalyzer stuff; opt-in within on_saltstack conditional 2014-05-19 18:29:09 -06:00
David Boucha
6b60f45afe add windows 2014.1.4 installer links to docs 2014-05-19 18:22:52 -06:00
Colton Myers
5d92657b25 Merge pull request #12896 from bechtoldt/develop 
updating homebrew installation URL in Mac OS X Walkthrough TUT (doc)
 2014-05-19 15:26:32 -06:00
Mike Place
8b03270e1f More comprehensive documentation on scheduler 2014-05-19 14:58:24 -06:00
Arnold Bechtoldt
04a0133945 updating homebrew installation URL 2014-05-19 20:27:43 +02:00
Erik Johnson
89f685b7d4 Add note about new hard dep for python-requests 2014-05-18 17:55:16 -05:00
Thomas S Hatch
b924ef78c0 Merge pull request #12859 from ahmadsherif/develop 
Move mine_interval example to a minion conf file
 2014-05-17 12:02:22 -05:00
Seth House
e3947b590c Added note when using the loader to run modules that contact the master 
Closes #12732
 2014-05-16 18:25:14 -06:00