C. R. Oldham
b3c3f5263a
Make doc build test pass.
2019-06-24 16:56:10 -06:00
C. R. Oldham
800113083b
Add event_listen_queue_max_seconds to fix #53411
2019-06-24 16:06:43 -06:00
Gareth J. Greenaway
89398a9049
Update salt.modules.service.rst
2019-06-18 17:10:42 -07:00
Gareth J. Greenaway
b9c1b1a35e
Update salt.modules.service.rst
...
Fixing merge conflict.
2019-06-18 17:07:02 -07:00
Gareth J. Greenaway
a962a64a5f
Merge branch '2019.2.1' into patch-2
2019-06-18 17:02:36 -07:00
Gareth J. Greenaway
f72ebba980
Merge pull request #53498 from amendlik/links
...
Fix broken documentation links
2019-06-18 16:44:04 -07:00
Adam Mendlik
e360a70673
Fix broken documentation links for service virtual module
2019-06-15 09:32:23 -06:00
Adam Mendlik
56f65ec2db
Fix broken documentation links for pkg virtual module
2019-06-15 09:32:23 -06:00
Wesley Whetstone
010a2c5b25
Update documentation for newer mac_service module.
2019-06-10 16:25:46 -07:00
Tyler Johnson
6d163438b5
Updated 'used for' description of aixpkg
2019-06-04 14:09:38 -06:00
Tyler Johnson
6092683774
Added aixpkg to index
2019-06-04 13:14:43 -06:00
Tyler Johnson
2867d07434
Added refs to AIX module documentation
2019-06-04 13:04:16 -06:00
Erik Johnson
6db2beb6c0
Replace "pchanges" with "changes" to fix onchanges/prereq requisites
...
Since "pchanges" was never supported in the state compiler, and
"changes" is what these reqs always used, replacing "pchanges" with
"changes" will allow those requisites to work in test mode.
Conflicts:
- salt/states/file.py
- salt/states/linux_acl.py
- salt/utils/napalm.py
- tests/integration/modules/test_state.py
- tests/unit/states/test_file.py
2019-04-18 10:56:30 -04:00
Dmitry Kuzmenko
7f26e764fc
Revert "Update doc conf with the new import tornado.queues
"
...
This reverts commit 684bf584f6
.
2019-04-17 02:00:22 +03:00
Daniel Wozniak
6eb2bce9be
Merge pull request #52334 from waynew/51879-fix-binary-pillar-return-error
...
51879 fix binary pillar return error
2019-04-11 20:45:16 -07:00
Daniel Wozniak
ead856ee93
Merge branch '2019.2' into 51879-fix-binary-pillar-return-error
2019-04-11 16:33:20 -07:00
Gareth J. Greenaway
b191bc0d58
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support
2019-04-08 08:30:41 -07:00
Megan Wilhite
a4a552191a
Merge branch '2019.2' into patch-2
2019-04-05 17:41:55 -04:00
Gareth J. Greenaway
f848aa474d
Adding support back in with, a gated configuration option, for the old YAML Loader.
2019-04-05 11:31:03 -07:00
Ch3LL
63962b547a
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- salt/states/linux_acl.py
- salt/transport/ipc.py
2019-03-28 11:10:45 -04:00
Megan Wilhite
bda3ca2071
Merge pull request #51749 from terminal-labs/salt-cloud-map-alt-update
...
Salt cloud map alt update
2019-03-28 09:52:26 -04:00
Daniel Wozniak
14a6b9d417
Merge pull request #52306 from terminal-labs/replace-ping-with-version
...
Replaced `test.ping` with `test.version`
2019-03-27 15:50:06 -07:00
Dmitry Kuzmenko
cc46e9c498
Merge branch '2018.3' into bugs/49147_ipc_subscriber
2019-03-27 23:37:31 +03:00
Alan Cugler
9ca0f72308
Changed where to mention the map files compatibility for minion configuration options.
...
This is a result of @Ch3LL suggestion on the PR itself for this doc change.
2019-03-27 12:42:03 -05:00
Alan Cugler
364ef065e8
Added mention of map file alternative for minion configuration options.
...
Fixes : #51127
2019-03-27 12:42:03 -05:00
Megan Wilhite
8255901b33
document regex_replace
Jinja filter ( #52326 )
...
Fixes #48952 .
2019-03-27 10:14:07 -06:00
Wayne Werner
fb010c0a6e
Add binary pillar to the docs
2019-03-26 19:58:29 -05:00
Alan Cugler
c04ba6e35e
Changed a text artifact from the ping function to supporting text for the version function.
2019-03-26 09:58:26 -05:00
Alan Cugler
e8c8dba161
Added in an explaination of the --zone flag
...
approved in #52251
2019-03-25 16:10:29 -05:00
Gareth J. Greenaway
11cd485a8b
Merge branch '2018.3' into merge-2019.2
...
Conflicts:
- doc/topics/installation/freebsd.rst
2019-03-25 13:42:28 -07:00
Alan Cugler
0b1eb00dc4
Replaced test.ping
with test.version
...
Result of issue #52277
Any where `test.ping` still exists in the docs was left
because of the context in those docs.
2019-03-25 12:09:48 -05:00
Gareth J. Greenaway
68c02b9c34
Merge branch '2019.2' into merge-2019.2
2019-03-22 17:36:18 -07:00
Shane Lee
d1308324a3
Merge branch '2019.2' into patch-2
2019-03-22 18:08:36 -06:00
Megan Wilhite
34d601e902
Merge branch '2019.2' into merge-2019.2
2019-03-22 16:38:07 -04:00
Gareth J. Greenaway
a2fbbe05e1
Merge branch '2018.3' into replace-github-dead-link
2019-03-22 11:55:43 -07:00
Gareth J. Greenaway
08728cf660
Merge branch '2018.3' into replace-github-dead-link
2019-03-22 11:32:15 -07:00
Akmod
ca00e4bf20
Merge branch '2018.3' of github.com:saltstack/salt into doc_fix
2019-03-22 11:29:54 -06:00
Akmod
8e1ec15c39
Add missing master/minion docs for log_rotate*
...
Adds log_rotate_backup_count and log_rotate_max_bytes to the
minion and master config documentation
Solves issue: #51921
2019-03-22 11:26:01 -06:00
Dmitry Kuzmenko
2bc2a7d83e
Merge branch '2018.3' into bugs/49147_ipc_subscriber
2019-03-22 18:02:55 +03:00
Megan Wilhite
f63bae987d
Merge branch '2019.2' into rn_update
2019-03-21 11:24:36 -04:00
Dmitry Kuzmenko
684bf584f6
Update doc conf with the new import tornado.queues
2019-03-20 21:04:49 +03:00
Søren Skov Eriksen
5db7a3f2df
Fix Typos "swtich" to "switch"
2019-03-19 13:59:36 +01:00
Alan Cugler
62e54044fc
github issue tracker link and sends you to the url for listed issues.
2019-03-18 16:18:40 -05:00
Alan Cugler
842ec84186
Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix
2019-03-18 14:32:32 -05:00
Gareth J. Greenaway
f68caa633f
Merge branch '2018.3' into bp-47005
2019-03-15 18:09:24 -07:00
Megan Wilhite
d1700f3afc
Merge branch '2018.3' into bp-47005
2019-03-15 12:03:50 -04:00
Max Arnold
75acce19f1
Rename obsolete beacon validation function
2019-03-15 18:28:12 +07:00
Ch3LL
25ae7c8873
remove freebsd-upstream reference
2019-03-14 17:41:21 -04:00
Ari Maniatis
b70c45c297
Remove salt FreeBSD repo which is now 2 years out of date
...
The saltstack repository has the 2016 version is current. Its not being updated, but there is a perfectly good port in the FreeBSD tree to use instead. Enhance the documentation on how to install that from binary or source.
2019-03-14 17:40:18 -04:00
Ch3LL
9ada8d9b7f
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- salt/transport/zeromq.py
- tests/unit/modules/test_kubernetesmod.py
- tests/unit/modules/test_win_file.py
2019-03-14 16:13:54 -04:00