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
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
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
08728cf660
Merge branch '2018.3' into replace-github-dead-link
2019-03-22 11:32:15 -07: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
Ch3LL
7ad4758f6f
Update device names in proxy getting started docs
2019-03-08 12:51:08 -05:00
Megan Wilhite
e2c3f93bd2
Merge branch '2019.2' into rn_update
2019-03-08 10:45:40 -05:00
Megan Wilhite
b217f948ee
Merge branch '2018.3' into py3_doc
2019-03-07 10:59:51 -05:00
Ch3LL
605bfaf7c5
Update futures dependency for python2 only
2019-03-07 10:59:01 -05:00
Megan Wilhite
164398f68e
Merge branch '2019.2' into rn_update
2019-03-07 10:54:03 -05:00
Megan Wilhite
54ea40a265
Merge branch '2019.2' into merge-2019.2
2019-03-07 10:38:23 -05:00
Gareth J. Greenaway
faa3471c05
Merge branch '2018.3' into 2018.3
2019-03-05 17:42:18 -08:00
Ch3LL
a16891347c
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- doc/conf.py
- salt/modules/win_system.py
- salt/states/boto3_route53.py
2019-03-05 16:00:05 -05:00
Bryce Larson
ecf0ef00b8
Fix typo in 2019.2.0 release notes
2019-03-05 13:13:24 -07:00
Ch3LL
9adc19eeb1
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/modules/zfs.py
2019-03-05 14:08:35 -05:00
Megan Wilhite
c04b2a09f3
Merge branch '2019.2' into rn_update
2019-03-05 11:34:58 -05:00
Denys Havrysh
9ca6e503b9
Update doc/topics/releases/2019.2.0.rst
...
Co-Authored-By: Ch3LL <megan.wilhite@gmail.com>
2019-03-05 11:34:33 -05:00
Denys Havrysh
052f193f1c
add additional formatting to 2019.2.0 release notes
...
Co-Authored-By: Ch3LL <megan.wilhite@gmail.com>
2019-03-05 10:17:54 -05:00
Daniel Wozniak
92752071c4
Merge branch '2017.7' into docs-sphinx-ref-deadlink-fix
2019-03-05 03:08:36 -07:00
Daniel Wozniak
f867e6e565
Merge pull request #51761 from sdodsley/cheery_pick_fb_releasenotes
...
Add new module to release notes for 2019.2.0
2019-03-05 02:44:55 -07:00
Daniel Wozniak
a6891778ec
Merge pull request #51807 from Ch3LL/2018.3.5_rn
...
Add 2018.3.5 release notes
2019-03-05 02:27:23 -07:00
Daniel Wozniak
ff5d7d6e59
Merge pull request #51810 from Ch3LL/2019.2.1_rn
...
Add 2019.2.1 release notes
2019-03-05 02:26:46 -07:00
Ch3LL
a6ca59a1a2
Update 2019.2.0 release notes with other tojson example
2019-03-04 14:49:40 -05:00
Daniel Wallace
8572c17091
rename kubernetes module to kubernetesmod
...
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
2019-03-01 13:33:50 -06:00
Ch3LL
072cd84c7d
Update supported python versions in installation docs
2019-03-01 14:29:50 -05:00
Ch3LL
9a681367a6
Update release documentation
2019-03-01 10:21:02 -05:00
Ch3LL
502d197f84
fix spelling error in release notes
2019-02-27 14:04:41 -05:00
Ch3LL
4d53b41740
Add new terraform salt-ssh roster feature to release notes
2019-02-27 14:00:07 -05:00
Ch3LL
aaee5fa0b7
Add 2019.2.1 release notes
2019-02-25 16:38:16 -05:00
Ch3LL
2c0b85c8f6
Add 2018.3.5 release notes
2019-02-25 16:31:34 -05:00
Alan Cugler
1f00c89fca
Added in python 3 server according to the consensus from #51748
2019-02-22 15:22:10 -06:00
Alan Cugler
8d70e3bbb5
Replaced all bad sphinx links with ones from the new sphinx doc site.
2019-02-22 11:27:47 -06:00
