Erik Johnson
d9c4462c4e
Fix 500 error when using wheel_async
...
When `wheel_async` is used, the job completes, but for the same reason
we couldn't replace the signal in the first place, we fail to restore it
after control is returned to the context manager.
This fixes this by only adding the signal data to the `old_signals` dict
when we successfully override the signal handling, so that we don't
incorrectly attempt to "restore" the signal later.
2019-01-24 16:23:29 -06:00
Pedro Algarvio
85e7ac67c1
Merge pull request #51306 from s0undt3ch/2018.3
...
Add 2018.3 codecov config
2019-01-24 13:34:13 +00:00
Pedro Algarvio
5f0f296a1a
Add 2018.3 codecov config
2019-01-24 13:28:59 +00:00
Pedro Algarvio
5a398a3503
Merge pull request #51207 from twangboy/fix_test_pkg
...
Backport 50771 to 2018.3
2019-01-24 11:40:08 +00:00
Pedro Algarvio
d4ab6d815b
Merge branch '2018.3' into fix_test_pkg
2019-01-24 11:39:57 +00:00
Pedro Algarvio
7a97cb4f67
Merge pull request #51252 from dwoz/issue-50221
...
Peserve newlines from pillar data for file.managed [2018.3]
2019-01-24 11:37:06 +00:00
Pedro Algarvio
f96828a9d6
Merge branch '2018.3' into issue-50221
2019-01-24 11:36:52 +00:00
Pedro Algarvio
253f5e4608
Merge pull request #51264 from gtmanfred/2018.3
...
an argument is not always needed to be passed to open a file
2019-01-24 07:55:25 +00:00
Pedro Algarvio
f3ebd32246
Merge branch '2018.3' into 2018.3
2019-01-24 07:55:12 +00:00
Pedro Algarvio
aacc047686
Merge pull request #51274 from twangboy/fix_network
...
Fix minion start issue
2019-01-23 18:03:02 +00:00
Daniel Wallace
f553be764e
tuples don't have pop
2019-01-23 11:10:04 -06:00
Daniel Wallace
55ea80ee6c
don't shadow builtin
2019-01-23 09:53:50 -06:00
Daniel Wallace
6148c50781
an argument is not always needed to be passed to open a file
2019-01-23 09:53:50 -06:00
Daniel Wozniak
8a89cb2c4b
Merge pull request #51279 from twangboy/backport_lgpo
...
Backport __context__ support from develop
2019-01-23 08:28:46 -07:00
Daniel A. Wozniak
a5255f0eb2
Merge remote-tracking branch 'saltstack/2018.3' into issue-50221
2019-01-23 08:26:20 -07:00
Pedro Algarvio
344bf6567a
Fix tests. We no longer get ipaddress instances back.
2019-01-23 14:47:11 +00:00
Pedro Algarvio
6796e656ec
Merge pull request #51276 from garethgreenaway/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-01-23 07:04:20 +00:00
Gareth J. Greenaway
44ddc43ce9
Merge branch '2018.3' into merge-2018.3
2019-01-22 18:22:11 -08:00
Thomas S Hatch
0adde9b74d
Merge pull request #51220 from sathieu/artifactory-classifier-2018.3
...
Backport fixes #31179 by appling the same logic as used in the nexus module
2019-01-22 15:27:54 -07:00
Thomas S Hatch
f6a7cad822
Merge pull request #51225 from astronouth7303/loader-docs-2018.3
...
Loader docs 2018.3
2019-01-22 15:18:47 -07:00
Thomas S Hatch
1a2f680e1d
Merge pull request #51239 from garethgreenaway/51208_file_manage_escaped_double_quotes
...
[2018.3] Fixes to __build_parts in stringutils
2019-01-22 15:17:48 -07:00
Thomas S Hatch
d614127005
Merge pull request #51261 from OrangeDog/patch-2
...
Fix Zabbix returner
2019-01-22 15:15:39 -07:00
Gareth J. Greenaway
464d813b77
Merge branch '2018.3' into fix_test_pkg
2019-01-22 13:42:03 -08:00
Gareth J. Greenaway
097103553b
Merge branch '2018.3' into merge-2018.3
2019-01-22 13:26:23 -08:00
Megan Wilhite
276d621799
Merge pull request #51197 from Ch3LL/tag_manager
...
Add Google Tag Manager to Docs
2019-01-22 14:08:47 -05:00
Daniel A. Wozniak
c1ea10f090
Fix py3 managed.file test failure
2019-01-22 10:46:32 -07:00
Erik Johnson
c8e70a90a6
Merge pull request #51206 from terminalmage/fix-reload
...
Fix usage of reload for PY3 compatibility
2019-01-22 11:34:45 -06:00
Erik Johnson
41ae39067e
Merge pull request #51231 from terminalmage/issue51056
...
Clarify documentation for the the gitfs "all_saltenvs" config param
2019-01-22 11:33:19 -06:00
twangboy
06b1545ce6
Remove network.py patch
...
This is fixed via another PR (#51274 )
2019-01-22 10:31:31 -07:00
twangboy
2356f2574a
Add __context__ support
...
Fix issue with case sensitivity
2019-01-22 10:26:12 -07:00
Gareth J. Greenaway
243dc06e23
Merge branch '2017.7' into merge-2018.3
...
Conflicts:
requirements/dev.txt
tests/unit/states/test_mount.py
2019-01-22 09:08:24 -08:00
twangboy
345aa5bd4a
Fix minion start issue
2019-01-22 09:43:17 -07:00
Gareth J. Greenaway
0574476321
Merge branch '2018.3' into fix_test_pkg
2019-01-22 08:42:33 -08:00
Erik Johnson
a6a9040e50
Merge pull request #51179 from terminalmage/fix-regex-chars
...
Fix possible oversight in nodegroup modifications
2019-01-22 06:50:48 -06:00
James Howe
d809b9bd9c
Avoid double-counting errors and ignore test runs
2019-01-21 15:35:59 +00:00
James Howe
6ca7deb268
Remove unused host parameter and average/disaster keys
2019-01-21 15:35:59 +00:00
James Howe
2d445273f6
Just let zabbix_sender use the config file
...
There doesn't appear to be any reason to parse or override it here.
Also allows allows TLS connections to work.
2019-01-21 15:35:59 +00:00
James Howe
6404e2ca93
Fix fallback command so it's actually run
2019-01-21 15:35:59 +00:00
James Howe
b79a55afd3
Fix KeyError in Zabbix returner
2019-01-21 13:44:55 +00:00
Daniel A. Wozniak
537114cbc9
Remoe un-needed log statement
2019-01-20 17:52:45 -07:00
Daniel A. Wozniak
ac978f0647
Fix 50221 regression test on Windows
2019-01-19 18:21:27 -07:00
Daniel Wozniak
d5acd5bc9c
Merge pull request #51170 from dwoz/issue51158
...
Honor roster system for ssh orchestrations
2019-01-19 16:16:05 -07:00
Daniel A. Wozniak
65f38b5ab2
peserve newlines from pillar data for file.managed
2019-01-19 16:11:49 -07:00
Pedro Algarvio
5543a53215
Update pytest requirements
2019-01-19 18:37:52 +00:00
Pedro Algarvio
f958df5c2e
Move all of PyTest requirements to its own requiremnts file
2019-01-19 18:37:52 +00:00
Pedro Algarvio
acfb7d89b4
Update pytest requirements
2019-01-19 18:37:41 +00:00
Pedro Algarvio
c19479bf4e
Move all of PyTest requirements to its own requiremnts file
2019-01-19 18:37:41 +00:00
Pedro Algarvio
39e633f23c
Merge pull request #51246 from garethgreenaway/bp-50358
...
[2017.7] Backport #50358 to 2017.7
2019-01-19 18:36:18 +00:00
Gareth J. Greenaway
4251c0cb92
Merge branch '2018.3' into 51208_file_manage_escaped_double_quotes
2019-01-19 08:42:06 -08:00
Gareth J. Greenaway
b9a0705a83
Merge branch '2018.3' into tag_manager
2019-01-18 17:34:41 -08:00
