Bryce Larson
ffa4ed6a02
improve lint job
2019-09-29 15:01:09 -06:00
Daniel Wozniak
6b43fbe863
Merge pull request #54783 from garethgreenaway/54751_fixing_missing_metaproxy_directory
...
Ensure metaproxy directory is included in sdist
2019-09-28 19:17:22 -07:00
David Hilton
7912b67a9a
Merge pull request #54784 from dhiltonp/ipv46
...
fix dns_check to return uri-compatible ipv6 addresses, add tests
2019-09-28 04:36:49 -04:00
David Hilton
042a101e38
Merge branch '2019.2.1' into ipv46
2019-09-27 13:43:19 -06:00
Daniel Wozniak
2f94b44c95
Merge pull request #54779 from frogunder/releasenotes_2019.2.2
...
Add 2019.2.2 release notes
2019-09-27 10:45:45 -07:00
Gareth J. Greenaway
67d9938d23
Merge branch '2019.2.1' into 54751_fixing_missing_metaproxy_directory
2019-09-27 10:31:51 -06:00
David Hilton
ac6b54f70c
Merge branch '2019.2.1' into ipv46
2019-09-27 09:12:09 -06:00
David Hilton
93ebd0984a
update mock (py2) from 2.0.0 to 3.0.5
2019-09-27 05:33:09 -06:00
David Hilton
37bcc4cb5b
fix dns_check to return uri-compatible ipv6 addresses, add tests
2019-09-27 05:32:53 -06:00
Gareth J. Greenaway
a35e609974
Adding __init__.py to metaproxy directory so that metaproxy is included when running setup.py.
2019-09-26 15:01:51 -06:00
Frode
67f564b938
Add 2019.2.2 release notes
2019-09-26 17:37:39 +00:00
Daniel Wozniak
46bec3c9d9
Merge pull request #54731 from pizzapanther/not-so-__new__-and-shiny
...
Fix returners not loading properly
2019-09-26 10:24:26 -07:00
Pedro Algarvio
bdf24f4064
Make sure we tests salt-master's event_return setting
2019-09-25 16:11:18 +01:00
Paul Bailey
54995181bb
remove unnecessary import
2019-09-24 17:49:48 -05:00
Paul Bailey
3f8a3824d7
fix module import
2019-09-24 17:10:47 -05:00
Paul Bailey
0746aa76dd
remove __new__ method since it was removed from parent class
2019-09-24 16:44:49 -05:00
Bryce Larson
e2b86bf274
Merge pull request #54706 from bryceml/2019.2.1_ruby
...
2019.2.1 ruby
2019-09-23 10:00:26 -06:00
Bryce Larson
168a6c1f20
switch to ruby 2.6.3
2019-09-20 12:13:24 -06:00
Daniel Wozniak
8d4d5eaeb2
Merge pull request #54441 from frogunder/rn_2019.2.1
...
Release_notes for 2019.2.1
2019-09-09 14:45:41 -07:00
Frode Gundersen
3a494a246c
Update 2019.2.1.rst
2019-09-09 15:25:03 -06:00
Frode
378994a1f7
Release_notes for 2019.2.1
2019-09-09 20:59:19 +00:00
Daniel Wozniak
62fc61c8ff
Merge pull request #54433 from dwoz/sudo_minion
...
Re-gen executors with proper arguments
2019-09-09 12:14:03 -07:00
Daniel Wozniak
e08eb19d7f
Merge branch '2019.2.1' into sudo_minion
2019-09-09 11:57:34 -07:00
Daniel Wozniak
76fac576c5
Merge pull request #54434 from frogunder/fix_doc
...
fix_docs
2019-09-09 11:55:27 -07:00
Frode
2d22d738f4
fix_docs error
2019-09-09 14:13:26 +00:00
Frode
a266a5cd7b
fix_docs
2019-09-06 22:23:54 +00:00
Daniel A. Wozniak
db5464a919
Fix linter warts
2019-09-06 21:47:08 +00:00
Daniel A. Wozniak
144a6008bd
Re-gen executors with proper arguments
2019-09-06 21:28:52 +00:00
Daniel Wozniak
4071dcb917
Merge pull request #54424 from frogunder/releasenotes_201921_new
...
remove in progress from release_notes 2019.2.1
2019-09-05 16:11:03 -07:00
Frode Gundersen
b66436f998
Update 2019.2.1.rst
2019-09-05 16:54:48 -06:00
Frode
bcfef114e6
remove in progress from release_notes 2019.2.1
2019-09-05 22:51:20 +00:00
Daniel Wozniak
c1587ccf4d
Merge pull request #54416 from frogunder/man_pages_201921
...
Update man_pages for 2019.2.1
2019-09-05 15:48:50 -07:00
Daniel Wozniak
3118e2fc20
Merge pull request #54419 from frogunder/release_notes_201921
...
releasenotes 2019.2.1
2019-09-05 15:48:41 -07:00
Frode Gundersen
2caee96701
Update doc/topics/releases/2019.2.1.rst
...
Co-Authored-By: Megan Wilhite <megan.wilhite@gmail.com>
2019-09-05 15:14:26 -06:00
Frode Gundersen
ffabde2132
Update 2019.2.1.rst
2019-09-05 15:14:04 -06:00
Frode Gundersen
dd6426d05b
Update doc/topics/releases/2019.2.1.rst
...
Co-Authored-By: Megan Wilhite <megan.wilhite@gmail.com>
2019-09-05 15:07:40 -06:00
Frode Gundersen
9d4239c8db
Update doc/topics/releases/2019.2.1.rst
...
Co-Authored-By: Megan Wilhite <megan.wilhite@gmail.com>
2019-09-05 15:04:56 -06:00
Frode Gundersen
8c60ae4991
Update doc/topics/releases/2019.2.1.rst
...
Co-Authored-By: Megan Wilhite <megan.wilhite@gmail.com>
2019-09-05 15:04:48 -06:00
Frode
72cb24ce11
releasenotes 2019.2.1
2019-09-05 20:59:17 +00:00
Frode
6f7c4eefbe
Update man_pages for 2019.2.1
2019-09-05 19:45:24 +00:00
Daniel Wozniak
04e28cff9b
Merge pull request #54409 from dwoz/mm_log
...
Point salt-call to correct multi-master configs
2019-09-04 13:08:23 -07:00
Daniel A. Wozniak
e207de6408
Point salt-call to correct multi-master configs
2019-09-04 19:55:19 +00:00
Daniel Wozniak
2c281e0bea
Merge pull request #54396 from dwoz/multimaster_logging
...
Use different logging port for multimaster tests
2019-09-03 16:20:22 -07:00
Daniel Wozniak
730a007abb
Merge pull request #54388 from dwoz/54256-re-fix-empty-api-token-2019.2.1
...
54256 re fix empty api token 2019.2.1
2019-09-03 16:19:19 -07:00
Daniel A. Wozniak
104e0a0066
Use different logging port for multimaster tests
2019-09-03 21:06:38 +00:00
Daniel A. Wozniak
80651d3030
Fix linter
2019-09-03 20:47:10 +00:00
Wayne Werner
982ed3d793
Delete bad API token files
...
Under the following conditions and API token should be considered
invalid:
- The file is empty.
- We cannot deserialize the token from the file.
- The token exists but has no expiration date.
- The token exists but has expired.
All of these conditions necessitate deleting the token file. Otherwise
we should simply return an empty token.
2019-09-03 20:46:04 +00:00
Daniel Wozniak
11016cedf3
Merge pull request #54376 from dwoz/tmp_token
...
Move tokens in place with an atomic operation
2019-09-03 13:40:49 -07:00
Daniel A. Wozniak
0b28c6059b
Fix linter complaints
2019-09-03 16:59:31 +00:00
Daniel Wozniak
5161203679
Merge pull request #54386 from twangboy/fix_test_win_dacl_2019.2.1
...
Fix unit.utils.test_win_dacl (2019.2.1)
2019-09-03 09:57:24 -07:00
