twangboy
b658900c01
Add Py2 Warning for Py2 Installer
2019-01-31 15:53:31 -07:00
Erik Johnson
6a62e7912a
Add integration test for architecture support
2019-01-31 16:12:51 -06:00
Erik Johnson
67ae5a59a7
Add support for architectures for APT pkgrepo.managed states
2019-01-31 16:12:51 -06:00
Gareth J. Greenaway
3582f6e209
Fixing the underline.
2019-01-31 10:30:58 -08:00
Gareth J. Greenaway
a8f42a0d42
Various documentation fixes.
2019-01-31 10:30:57 -08:00
Erik Johnson
529cce0dba
Fix deprecation warning in nested outputter
...
Pull request #50963 introduces a deprecation warning on later Python 3
releases, as the abstract base classes now live in `collections.abc`.
This fixes that deprecation warning.
2019-01-31 10:21:42 -06:00
Erik Johnson
191235d8d3
Remove custom grains module from 2018.3 branch
...
Support for passing the grains data to custom grains modules wasn't
added until the 2019.2 release cycle. It seems like this file was
included when something else was backported to 2018.3.
2019-01-31 09:10:45 -06:00
Erik Johnson
13de0b8f18
Merge pull request #50963 from terminalmage/issue50942
...
pip.installed: Fix traceback when _find_key doesn't return a match
2019-01-30 18:25:55 -06:00
Daniel Wozniak
ecd1637206
Merge branch '2017.7' into fix_raise_2017.7
2019-01-30 16:31:16 -07:00
Daniel A. Wozniak
5bc466e5e4
Fix python 3 path for shell test cases
2019-01-30 17:05:17 -05:00
Daniel A. Wozniak
5351e5c459
Add testing path to run_script commands
2019-01-30 17:05:10 -05:00
Daniel A. Wozniak
2d8a3641bc
Fix linter issues
2019-01-30 17:05:03 -05:00
Daniel A. Wozniak
9b8718a1d5
Cloud provider and profile configs are merged
2019-01-30 17:04:50 -05:00
Erik Johnson
c84be3fb4f
Allow for kwargs to be used in object initialization
2019-01-30 15:44:06 -06:00
Erik Johnson
2bf93fd9af
pip states: Use case-insensitive dictionaries for pip.list return
2019-01-30 15:44:06 -06:00
Erik Johnson
792f05403c
Add a CaseInsensitiveDict implementation
2019-01-30 15:21:38 -06:00
Erik Johnson
1410164ee9
pip.installed: Fix traceback when _find_key doesn't return a match
2019-01-30 15:16:50 -06:00
Daniel Wozniak
a880e422ec
Merge pull request #51438 from twangboy/fix_raise_2018.3.4
...
Add missing raise statement
2019-01-30 13:04:04 -07:00
Daniel Wozniak
67b7d285ed
Merge pull request #51370 from dwoz/setup_py_req_fix
...
Handle pipenv like version restrictions
2019-01-30 13:03:40 -07:00
Daniel Wozniak
e9b3d946d0
Merge pull request #51367 from dwoz/cloud_config_2017
...
Cloud provider and profile configs are merged [2017.7]
2019-01-30 13:03:12 -07:00
Daniel Wozniak
60953b723a
Merge pull request #51366 from dwoz/cloud_config_merge
...
Cloud provider and profile configs are merged [2018.3]
2019-01-30 11:58:45 -07:00
twangboy
5830fad5b4
Add missing raise statement
2019-01-30 11:26:46 -07:00
twangboy
f3c9cd4166
Add missing raise statement
2019-01-30 11:20:56 -07:00
Daniel Wozniak
28b898c54b
Merge pull request #51432 from Ch3LL/bp-51324
...
Backport #51324 into 2018.3.4
2019-01-30 10:51:49 -07:00
Gareth J. Greenaway
bd41ff0f59
Fixing various bits in x509 module and unit test to ensure tests are passing on python2 & python3
2019-01-30 11:01:06 -05:00
Pedro Algarvio
9ab2ec62f9
Coverage on windows chokes with the tox env var COVERAGE_PROCESS_START
2019-01-30 11:48:37 +00:00
Pedro Algarvio
4994c388de
Switch required PyTest dependency
2019-01-30 11:48:30 +00:00
Pedro Algarvio
3a21afa73d
Coverage on windows chokes with the tox env var COVERAGE_PROCESS_START
2019-01-30 11:47:15 +00:00
Pedro Algarvio
1c62e2750e
Switch required PyTest dependency
2019-01-30 11:46:50 +00:00
Daniel A. Wozniak
e1e06a0f1b
Fix python 3 path for shell test cases
2019-01-30 03:18:31 -07:00
Daniel A. Wozniak
3f4c5a3e2d
Merge branch 'cloud_config_2017' of github.com:dwoz/salt into cloud_config_2017
2019-01-30 03:17:27 -07:00
Daniel A. Wozniak
7bb4ceb620
Fix python 3 path for shell test cases
2019-01-30 03:15:41 -07:00
Daniel A. Wozniak
ae351eb055
Fix python 3 path for shell test cases
2019-01-30 03:13:21 -07:00
Daniel Wozniak
8b8d41aa19
Merge branch '2017.7' into cloud_config_2017
2019-01-29 19:45:05 -07:00
Daniel Wozniak
09cd5fc752
Merge branch '2017.7' into setup_py_req_fix
2019-01-29 19:44:39 -07:00
Daniel Wozniak
b80320db44
Merge pull request #51402 from dwoz/win_test_fix
...
Add testing path to run_script commands
2019-01-29 19:44:16 -07:00
Daniel Wozniak
48062c89a7
Merge branch '2018.3' into cloud_config_merge
2019-01-29 19:43:26 -07:00
Daniel A. Wozniak
eeea289806
Add testing path to run_script commands
2019-01-29 19:38:46 -07:00
Daniel Wozniak
21359e69e8
Merge branch '2017.7' into win_test_fix
2019-01-29 19:37:50 -07:00
Daniel Wozniak
1199530a85
Merge pull request #51397 from dwoz/gemstest
...
Use gems.github.com no longer exists, use gemcutter.org
2019-01-29 19:37:25 -07:00
Daniel Wozniak
89710a7e37
Merge pull request #51401 from dwoz/run_script_win
...
Add testing path to run_script commands [2018.3]
2019-01-29 18:34:48 -07:00
Daniel A. Wozniak
bac652f439
Add testing path to run_script commands
2019-01-29 17:52:42 -07:00
Daniel A. Wozniak
77fdf35e3c
Add testing path to run_script commands
2019-01-29 17:26:04 -07:00
Daniel A. Wozniak
43ac36e5ff
Use gems.github.com no longer exists, use gemcutter.org
2019-01-29 14:24:27 -07:00
Erik Johnson
1438a6299d
Merge pull request #51389 from terminalmage/proxy-fixes
...
Backport proxy fixes to 2018.3
2019-01-29 14:17:27 -06:00
Erik Johnson
3cec85e725
Normalize results if test proxy is enabled
2019-01-29 12:58:24 -06:00
Megan Wilhite
8acd9e5da2
Merge pull request #51368 from s0undt3ch/hotfix/tests
...
Fix test
2019-01-29 12:36:48 -05:00
Pedro Algarvio
01717d2455
Merge pull request #51377 from twangboy/fix_auditpol_2018.3.4
...
Fix issue when directory doesn't exist in LGPO module (2018.3.4)
2019-01-29 17:33:24 +00:00
Thomas S Hatch
f511ad278c
Merge pull request #51227 from astronouth7303/doc-modules-additional-globals
...
Document the client-defined dunders
2019-01-29 10:27:07 -07:00
Jamie Bliss
cbe1e171d6
Merge branch '2017.7' into doc-modules-additional-globals
2019-01-29 12:09:32 -05:00
