Thomas Jackson
9db7f8f7e9
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
2afd4c8c04
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
d12677156e
Whitespace cleanup
2014-12-11 07:53:19 -08:00
Thomas Jackson
3859204103
Fix typo in renderers doc, the directory name was wrong
2014-12-10 18:42:16 -08:00
Nitin Madhok
c299f4119a
Adding pillar to toctree
2014-12-08 10:52:38 -05:00
Nitin Madhok
f168af05ef
Adding state to toctree
2014-12-08 10:50:09 -05:00
Nitin Madhok
67fd828708
Adding modules to toctree
2014-12-08 10:34:33 -05:00
Colton Myers
472f6577e2
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/minion.py
salt/modules/localemod.py
salt/states/mount.py
salt/transport/__init__.py
salt/utils/schedule.py
2014-12-04 11:11:11 -07:00
Thomas S Hatch
1bfed11756
Merge pull request #18541 from cachedout/event_return
...
Event return
2014-12-03 09:56:33 -07:00
Seth House
54d8760d2d
Added docs for the state-level aggregate keyword
...
Also added clarification on the two ways to invoke the aggregation
function.
2014-12-02 18:33:10 -05:00
Pedro Algarvio
50105aa001
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/boto_secgroup.py
salt/modules/boto_vpc.py
tests/unit/modules/boto_vpc_test.py
2014-12-01 23:07:39 +00:00
Elias Probst
6a7662c498
Fix typo (agregate → aggregate).
2014-11-29 15:58:07 +01:00
Mike Place
8297c2c48e
Documentation
2014-11-26 16:56:45 -07:00
Thomas S Hatch
2e3089410a
Merge pull request #18514 from cachedout/issue_16879
...
Update docs for unless
2014-11-26 09:29:24 -07:00
Thomas S Hatch
6aa5b0f858
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/genesis.py
salt/modules/parted.py
salt/modules/win_service.py
salt/runner.py
salt/states/file.py
tests/integration/netapi/rest_tornado/test_app.py
2014-11-26 09:24:24 -07:00
Mike Place
988b8e621d
Update docs for unless
...
Note that unless is run for each associate state dec.
2014-11-26 09:17:14 -07:00
rallytime
73f3c0091d
Clean up doc build so it doesn't stacktrace
...
Fixes #18471
- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
2014-11-25 15:11:15 -07:00
Nitin Madhok
93700aa642
Fixing sphinx errors and violations
2014-11-25 15:01:30 -05:00
Konrad Starzyk
0759323c99
Merge remote-tracking branch 'upstream/develop' into jboss7
2014-11-25 11:52:27 +01:00
Colton Myers
754baafcf7
Merge branch '2014.7' into develop
2014-11-24 14:38:46 -07:00
Colton Myers
42223567b8
Add warning to docs about topfile compilation
...
Ref #12483
2014-11-24 14:33:37 -07:00
Konrad Starzyk
99406c2215
Merge remote-tracking branch 'upstream/develop' into jboss7
2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7
Documentation fixes for jboss7 and artifactory states/modules
2014-11-20 11:16:57 +01:00
pengyao
3ffa0dfc6b
Url should be '/keys'
2014-11-20 11:16:58 +08:00
Colton Myers
716a7e3331
Merge branch '2014.7' into merge-forward
...
Conflicts:
salt/modules/bsd_shadow.py
salt/modules/freebsdjail.py
salt/modules/yumpkg.py
salt/modules/zfs.py
salt/modules/zypper.py
salt/netapi/rest_tornado/saltnado.py
salt/states/dockerio.py
2014-11-18 12:46:29 -07:00
Nitin Madhok
5d8ae4e32f
Fixing sphinx violations and errors
2014-11-18 02:53:40 -05:00
Colton Myers
b2a2facb27
Add one additional folder and clarification to client_acl docs
2014-11-17 14:55:08 -07:00
Thomas Jackson
6d2fbc8715
Documentation for saltnado
2014-11-13 08:36:29 -08:00
Chris Martin
d03a2bf753
Remove an awkward comma splice in the docs.
2014-11-10 20:02:02 -08:00
Thomas S Hatch
b3d2edc9a5
Merge branch '2014.7' into develop
2014-11-04 15:11:23 -07:00
Colton Myers
df0547969f
We evaluate a prereq, we don't call it. Fixes #17086
2014-11-04 11:36:30 -07:00
Henrik Holmboe
1f3ba9ced5
Add possible values to arguments in Salt man-page
2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2
Typo jod -> job
2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837
Choose vs chose typo
2014-11-03 20:54:39 +01:00
Seth House
aff7ab3f43
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-29 16:47:23 -05:00
Seth House
9da07584e4
Added missing docs for the /key rest_cherrypy entry point
...
Should have been part of #16706 .
2014-10-29 16:35:04 -05:00
vs
7d84f116e3
fix formatting
2014-10-29 14:37:18 +01:00
vs
4beb56bdbb
add wheel.minions to wheel-index
2014-10-29 14:35:13 +01:00
vs
9e63712488
add documentation for wheel.minions
2014-10-29 14:18:23 +01:00
Colton Myers
945e6506b6
Merge branch '2014.7' into develop
2014-10-27 15:32:25 -06:00
Colton Myers
6da0967805
Fix pre-required vs pre-requiring mixups in prereq doc
2014-10-27 10:59:07 -06:00
rallytime
933be7c476
Merge branch '2014.7' into develop
...
Conflicts:
salt/master.py
salt/returners/mysql.py
salt/utils/cloud.py
salt/utils/minions.py
2014-10-25 08:54:42 -06:00
vs
692252f41b
Merge branch 'sreq_cache_option' into optional_sreq_caching
2014-10-23 15:55:26 +02:00
Thomas S Hatch
cb14a8660e
fix docs for mod_aggregate per #16575
2014-10-21 16:37:34 -06:00
Thomas S Hatch
3cf0cfb61d
Merge branch '2014.7' into develop
2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69
Add further clarification that gitfs auth is pygit2-only
2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d
Merge branch '2014.7' forward into develop
...
Conflicts fixed.
Conflicts:
salt/loader.py
salt/returners/carbon_return.py
salt/returners/couchbase_return.py
salt/returners/couchdb_return.py
salt/returners/elasticsearch_return.py
salt/returners/local_cache.py
salt/returners/memcache_return.py
salt/returners/mongo_future_return.py
salt/returners/mongo_return.py
salt/returners/mysql.py
salt/returners/odbc.py
salt/returners/postgres.py
salt/returners/redis_return.py
salt/returners/smtp_return.py
salt/returners/sqlite3_return.py
salt/states/dockerio.py
salt/utils/minions.py
2014-10-19 18:21:19 +01:00
vs
2e1d3b07b8
add cache_sreqs option to minion documentation
2014-10-16 07:33:37 +02:00
Erik Johnson
49c7e6ac1a
Fix misspelled code-block type
2014-10-15 22:44:27 -05:00
Erik Johnson
bb6de490ef
Grammar correction
2014-10-15 22:36:12 -05:00
Mike Place
d0e90c77a6
Typo fix
2014-10-14 13:18:54 -06:00
Mike Place
0fcc0b5ae7
Document pillar ovewrite strategy
2014-10-14 13:07:26 -06:00
Thomas S Hatch
1468c26ec1
Merge branch '2014.7' into develop
...
Conflicts:
doc/faq.rst
doc/ref/configuration/minion.rst
salt/minion.py
salt/states/pkg.py
salt/transport/__init__.py
2014-10-13 15:03:33 -06:00
Joseph Hall
130e0842c8
Merge pull request #16566 from terminalmage/docs
...
Minor wording fix in highstate docs
2014-10-11 06:34:39 -06:00
Erik Johnson
af64f17fe4
Minor wording fix in highstate docs
...
This fixes some grammar weirdness.
2014-10-10 22:25:55 -05:00
rallytime
54b7abdb17
Fix conf_minion references
2014-10-10 09:19:27 -06:00
Nicole Thomas
2901e9439b
Merge pull request #16514 from cachedout/master_doc_fix
...
Small doc fixes
2014-10-09 15:07:17 -06:00
Mike Place
11ef20fdf5
Small doc fixes
2014-10-09 10:14:37 -06:00
Seth House
b0615f9bbf
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-10-08 14:40:32 -06:00
rallytime
6d1c14b1be
Add recon_* config options to minion docs
...
Fixes #16471
2014-10-08 14:11:34 -06:00
Colton Myers
000b391f2f
State Module, not State Declaration
2014-10-07 19:25:44 -06:00
Thomas S Hatch
d4eaf2323e
Merge pull request #16339 from cachedout/module_fail_reasons
...
Module failure reporting
2014-10-07 10:21:37 -06:00
Jens Rantil
53153277ce
Fix incorrect client ACL documentation
...
Tested this by setting up a local Vagrant instance using the following
procedure:
1. Made a fresh minion/master install (using salt-bootstrap) of version
2014.1.10.
2. Adding a `test.ping` ACL rule for the `vagrant` user.
3. Asserting that I couldn't execute `salt '*' test.ping'` as `vagrant`
user.
4. Applying `chmod 755 /var/cache/salt /var/cache/salt/master/jobs
/var/run/salt /var/run/salt/master`.
5. Verifying that `salt '*' test.ping'` now works.
Fixes #16318 .
2014-10-05 10:40:37 +02:00
Mike Place
2abc93afe6
Merge branch 'develop' into module_fail_reasons
2014-10-03 13:08:39 -06:00
Mike Place
a5e1540f22
Provide a facility for modules to report the reasons they cannot be
...
loaded.
2014-10-02 15:43:10 -06:00
Jeremy Rosenbaum
4668480dff
fixes inconsistent bar/baz variable name in state module example
2014-10-01 21:53:45 -07:00
Chris Rebert
5ec98a7c4f
fix typos in doc/ref/configuration/master.rst
2014-10-01 14:06:11 -07:00
Ryan Lane
9eacaf1832
Add a use_master_when_local option to allow remote execution while using a local file_client
2014-09-28 18:53:43 -07:00
KennethWilke
0a4f3ad098
corrected master jobs path in clientacl doc
2014-09-25 16:07:28 -05:00
Thomas S Hatch
bc2a897c3e
Merge pull request #16063 from jacksontj/2014.7
...
2014.7 RC fixes/backports
2014-09-25 09:03:06 -06:00
Thomas S Hatch
3ce955c774
Merge branch '2014.7' into develop
...
Conflicts:
salt/cloud/deploy/bootstrap-salt.sh
2014-09-24 12:46:37 -06:00
Erik Johnson
a4413bb27a
Improve formatting
...
Bullet points look better here than an indented section with an enormous
font.
2014-09-23 20:58:26 -05:00
Thomas Jackson
6225ae5145
Remove "never timeout" feature
2014-09-23 14:13:44 -07:00
Thomas Jackson
2075fcde77
Update docs
2014-09-23 14:13:35 -07:00
Thomas Jackson
4fac8f7d22
Add master_id to master docs
2014-09-23 14:11:51 -07:00
Thomas S Hatch
3f82e3664a
Merge branch '2014.7' into develop
2014-09-23 14:41:58 -06:00
rallytime
872b312770
Clarify unless and onlyif docs
2014-09-22 16:03:04 -06:00
vs
94948047cf
add rotate_aes_key documentation to master-configuration reference
2014-09-22 14:43:59 -06:00
Colton Myers
99e97320e1
Merge branch '2014.7' into develop
...
Conflicts:
doc/ref/configuration/minion.rst
doc/ref/states/requisites.rst
doc/topics/troubleshooting/master.rst
doc/topics/tutorials/index.rst
doc/topics/tutorials/intro_scale.rst
salt/config.py
salt/key.py
salt/master.py
salt/minion.py
salt/modules/file.py
salt/modules/hashutil.py
salt/modules/lxc.py
salt/modules/oracle.py
salt/modules/tls.py
salt/modules/win_update.py
salt/pillar/pepa.py
salt/pillar/s3.py
salt/states/augeas.py
salt/states/win_update.py
salt/tops/ext_nodes.py
salt/utils/master.py
2014-09-22 14:22:54 -06:00
Thomas S Hatch
f331d977d5
Merge pull request #15938 from babilen/doc/req_indent
...
Fix indentation errors and inconsistencies
2014-09-19 09:42:00 -06:00
Thomas S Hatch
d88ceab872
Merge pull request #15917 from felskrone/fix_key_rotation
...
Rename key_no_rotate to rotate_aes_key
2014-09-18 14:14:18 -06:00
Wolodja Wentland
3925df10d3
Fix indentation errors and inconsistencies
...
Documentation for new requirements did not consistently use two spaces for
indentation or even no indentation at all.
2014-09-18 21:02:56 +02:00
vs
ae07fe381b
add documentation for the con_cache setting in master config
2014-09-18 14:26:49 +02:00
vs
da78c38b97
add rotate_aes_key documentation to master-configuration reference
2014-09-18 13:57:38 +02:00
Erik Johnson
f47dd063e3
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
f056c9c3fa
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
132bdb78ee
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
70f10cb13e
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Erik Johnson
13cc497b36
Fix sphinx build error
2014-09-17 18:00:18 -05:00
Nitin Madhok
197df512bb
Doc fixes
2014-09-16 09:54:52 -04:00
Colton Myers
8d0bf0ee95
Merge branch '2014.7' into develop
...
Conflicts:
salt/states/pip_state.py
2014-09-15 11:49:04 -06:00
Seth House
978931c470
Added salt-unity manpages
...
Closes #13937
2014-09-13 12:56:25 -06:00
Thomas S Hatch
d6e3e01c6d
Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules
...
F/add syslog ng modules
2014-09-12 10:37:02 -06:00
Thomas S Hatch
cd7c31df7f
Merge pull request #15691 from mickep76/develop
...
Added reference to Pepa doc. and in-line rst documentation
2014-09-11 23:12:55 -06:00
loz-hurst
9031ea871a
Fix broken back ticks in 68301c4
2014-09-11 16:15:35 +01:00
Jille Timmermans
a8e3586aa1
Some textual fixes
2014-09-11 14:45:44 +02:00
Michael Persson
5a3ddc3201
Add documentation link for Pepa
2014-09-11 10:30:17 +02:00
loz-hurst
68301c4339
Updated module documentation for clarification
...
Added note to say that __salt__ is not available to __virtual__. Also added link to 'at.py' as an example, since it demonstrates using salt.utils in __virtual__ which the existing examples do not. Tweaked wording to make clear that not all the examples are package managers any more.
2014-09-10 14:35:40 +01:00
Colton Myers
bb24131750
Merge branch '2014.7' into develop
2014-09-05 11:57:57 -06:00
Thomas S Hatch
71c9bf4708
Add docs for roster_file option
2014-09-05 11:55:11 -06:00
Thomas S Hatch
2f6ae96f37
Merge branch '2014.7' into develop
...
Conflicts:
salt/client/ssh/__init__.py
2014-09-03 14:43:07 -06:00
Nitin Madhok
0e61c4125d
Fixing sphinx violation and warning
2014-09-03 15:22:26 -04:00
Erik Johnson
510942d3ec
Remove references to masterless salt from gitfs docs
...
Alternate backends do not yet work with the local fileclient.
2014-09-02 15:59:05 -05:00
Mike Place
be60e25574
Merge branch '2014.7' into develop
2014-09-02 13:56:54 -06:00
Erik Johnson
ed631d69b5
Add fileserver_backend param to minion config documentation
...
Also correct an incorrect rst link target for hash_type
2014-09-02 14:36:35 -05:00
Erik Johnson
a3c62ef119
Add default value for fileserver_backend
2014-09-02 14:35:03 -05:00
Erik Johnson
6e98ef828d
gitfs_provider has no default value
2014-09-02 13:22:47 -05:00
Thomas S Hatch
39b107a283
Merge pull request #14820 from steverweber/add_conf_help
...
show_timeouts, new default
2014-09-02 12:13:31 -06:00
Scott Coil
6770ce314e
add ability to target pillar from ext pillar
2014-08-31 16:46:22 -05:00
Colton Myers
c12f05f83a
Merge branch '2014.7' into develop
...
Conflicts:
salt/modules/aptpkg.py
salt/modules/tls.py
salt/states/boto_asg.py
salt/states/boto_secgroup.py
2014-08-29 16:27:00 -06:00
btibi
69b0deacf6
syslog_ng: add syslog-ng state and execution modules
2014-08-29 23:20:25 +02:00
Mike Place
b2dfdd497f
Add failhard to minion conf doc
...
Refs #15371
2014-08-29 09:39:28 -06:00
rallytime
cfcfb4bdac
Change --list-profiles to accept an argument such as "linode" or "all"
2014-08-26 08:03:39 -06:00
rallytime
0f4f68eddf
Add --list-providers and --list-profiles to cloud docs
2014-08-26 00:18:57 -06:00
Ryan Lane
8048b01562
Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state
2014-08-25 13:37:47 -06:00
Thomas S Hatch
317ec24ccc
Merge pull request #15176 from jgillich/patch-1
...
remove example duplicate
2014-08-22 14:15:46 -06:00
Chris Rebert
a53ae15d23
copyedits
2014-08-22 11:59:13 -07:00
Jakob Gillich
0112f70d9c
remove example duplicate
2014-08-22 16:06:09 +02:00
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
Colton Myers
932aa97e1f
Merge branch '2014.7' into develop
2014-08-15 16:33:02 -06:00
Seth House
12e87f3545
Don't document the state.event function aliases
2014-08-15 08:31:08 -04:00
steve
d13c7275a7
show_timeouts, new default
2014-08-14 13:10:52 -04:00
Seth House
e2ed04351d
Merge remote-tracking branch 'upstream/2014.7' into develop
...
Conflicts:
salt/modules/npm.py
2014-08-13 18:56:23 -04:00
Seth House
d85791e3ef
Documented the expansion additon to names
...
Added docs for the addition in #13489 .
2014-08-13 18:19:02 -04:00
Thomas S Hatch
d352004c01
Merge branch 'boto-cloudwatch' of https://github.com/lyft/salt into lyft-boto-cloudwatch
2014-08-12 11:28:51 -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
4144da61bf
Fixing more sphinx warnings and errors
2014-08-11 14:38:45 -04: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
937a607448
Fixing more sphinx warnings and errors
2014-08-11 12:16:01 -04:00
Nitin Madhok
e7bea7cc87
Fixing sphinx Warnings and Errors
2014-08-11 10:20:15 -04:00
Pedro Algarvio
d177d99148
Merge branch 'hotfix/transifex-updates' into develop
2014-08-09 15:33:04 +01:00
Erik Johnson
dcfa621717
Add newline_values_only outputter to toctree
2014-08-07 19:25:03 -05:00
Ryan Lane
75ef59f60f
Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state
2014-08-07 16:11:55 -07: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
Seth House
8a60ce5351
Merge remote-tracking branch 'upstream/2014.7' into develop
...
Conflicts:
doc/topics/development/conventions/formulas.rst
2014-08-07 15:51:49 -04:00
Thomas S Hatch
de3a1ce283
Merge pull request #14690 from jacksontj/multi_syndic
...
Multi syndic
2014-08-06 20:53:39 -06: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
Seth House
b224efc0d2
Added link targets to a few requisite types
2014-08-06 10:39:47 -04:00
steve
bc3ade860c
catch exceptions and fix some vars
2014-08-05 22:39:57 -04:00
Nitin Madhok
61eb4fb041
Fixing YAML state syntax
2014-08-04 21:32:38 -04:00
Thomas Jackson
0ce353ddfb
Add master_id to master docs
2014-08-01 16:38:22 -07: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
Thomas S Hatch
8e0d8a7b9f
Merge branch '2014.7' into develop
2014-07-25 10:30:07 -06: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
YanChii
3aeb2fa0ab
Merge remote-tracking branch 'upstream/develop' into solaris-ips
2014-07-17 16:28:53 +02:00
YanChii
14ff5bc6d1
added Solaris IPS pkg module, updated pkg providers list
2014-07-17 16:28:34 +02: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
Seth House
caa54c0d28
Merge pull request #14197 from rallytime/requisite_docs
...
Requisite documentation
2014-07-14 14:52:51 -06:00
Colton Myers
08d7847e44
Add configuration file location for minion (and FreeBSD for master)
2014-07-14 12:22:27 -06:00
rallytime
f295b9b60b
Fix requisite documentation links
2014-07-14 10:33:02 -06:00
rallytime
29c6171af5
Fix "here" link on requisites doc
2014-07-14 10:13: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
David Boucha
a04e3d4a0b
make sure twilio_notify shows up in the docs
2014-07-13 00:12:23 -06:00
Ryan Lane
0306ed00b8
Combine requisites and alterting_states into a global state arguments document
2014-07-10 14:59:12 -07:00
btibi
851ce0fde4
Add syslog_ng execution module.
2014-07-09 22:42:36 +02:00
btibi
f69977d3e5
Add syslog_ng state module.
2014-07-09 22:04:13 +02:00
rallytime
f0d9db2497
Removed the term "Hydrogen" from versionadded notation
2014-07-01 15:01:12 -06:00
Seth House
918f12a376
Added roster modules to the documentation
2014-06-30 14:01:48 -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 Jackson
c721d9d664
Seperate saltnado_websockets from the rest of the implementation.
2014-06-20 15:10:56 -07:00
Seth House
acb203c735
Added salt-api to CLI TOC
2014-06-20 10:20:58 -06:00
Seth House
9f93aaf016
Renamed old autodoc-generated salt-api netapi module filenames
2014-06-19 13:19:24 -06:00
Seth House
ae413133f3
Added netapi modules to the module index
2014-06-18 23:04:45 -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
554a612aa4
Renamed netapis to netapi
2014-06-18 20:05:02 -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
Arnold Bechtoldt
9a5ce71286
trying to add foreman pillar module to documentation, refs #13481
2014-06-17 19:24:27 +02: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
Seth House
679f74198e
Added link target for the module sync system
2014-06-09 19:31:38 -06: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
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
Aditya Kulkarni
02d5c00358
Add docs
2014-06-05 10:12:00 -04: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
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
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
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
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
Pedro Algarvio
7bd8b1360f
Remove remaining exsel
code
2014-05-29 01:32:54 +01: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
Thomas S Hatch
2885907854
Merge pull request #13051 from gtmanfred/onlyif
...
Add documentation on altering states.
2014-05-27 16:18:57 -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
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
b15c7306b3
Add document for aliyun provider
2014-05-24 15:32:50 +08:00
Seth House
e150b9fc61
Added missing versionadded to onchanges requisite
...
Thanks to agronholm on IRC.
2014-05-21 18:46:35 -06: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
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
64b8fb6a81
Added label to the docs for writing execution modules
2014-05-20 23:30:02 -06:00
Ryan Lane
92f21c7b05
Adding boto_* modules and states to documentation.
2014-05-20 18:06:17 -04: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
Seth House
d0a7140ae6
Reorganized the Python API docs to be more Python-centric
2014-05-14 19:58:37 -06:00
Seth House
57b26354dd
Fixed incorrect documentation on the master/client config functions
...
Fleshed out the function docstrings and pulled those into the Python API
docs.
2014-05-14 18:49:29 -06:00
Seth House
59f2d07ffb
Bunch of misc rST fixes
2014-05-14 12:02:55 -06:00
KennethWilke
bd18389507
moar docs, moar betta
2014-05-13 15:07:30 -05: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
Thomas S Hatch
af58d29ab6
Add initial docs on onchanges and onfail
2014-05-07 16:02:36 -06:00
Thomas S Hatch
8bf268af76
Merge pull request #12547 from terminalmage/issue12505
...
Better documentation for outputters
2014-05-05 21:47:33 -06:00
Erik Johnson
b3e42245f6
Better documentation for outputters
2014-05-05 17:50:47 -05:00
Thomas S Hatch
2bcad0c037
iAdd initial mod_aggregate docs
2014-05-05 16:23:09 -06:00
Thomas S Hatch
0606f4b78c
initial docs for the mod_aggregate system
2014-05-05 16:00:17 -06:00
Chris Rebert
7d1df94bb1
copyedit ref docs
2014-04-30 14:08:31 -07:00
Erik Johnson
bfa3413f79
Improved wording for fileserver docs
2014-04-27 15:46:42 -05:00
Wes Turner
6aa523d9d1
DOC: Update GitFS documentation (syntax, links)
2014-04-22 05:42:10 -05:00
rallytime
12d5d87451
Some grammatical changes
2014-04-21 13:48:35 -06:00
rallytime
5789d4800c
Clarifications for require, watch, and prereq in requisites documentation
2014-04-21 13:40:00 -06:00
Seth House
85c929112c
Documented using the loader interface from the Python level
2014-04-18 17:14:35 -06:00
Seth House
1610bda84b
Pulled Jinja docs back into the code
...
We were accumulating two versions of the docs since people update
docstrings as they hack but only one was getting rendered on the site.
Hopefully this is a happy middle-ground by spreading the docs around a
bit and pulling them in to a central location.
2014-04-17 14:24:15 -06:00