Daniel Wozniak
b97b384b4e
Merge pull request #51390 from s0undt3ch/hotfix/singleton-refs
...
Avoid tracebacks when GC has nuked all objects
2019-01-29 15:13:44 -07:00
Pedro Algarvio
f1136fe836
Avoid tracebacks when GC has nuked all objects
...
Fixes #51369
2019-01-29 16:50:04 +00:00
Megan Wilhite
da396ef38c
Merge pull request #51376 from twangboy/fix_auditpol
...
Fix issue when directory doesn't exist in LGPO module
2019-01-29 09:59:58 -05:00
Megan Wilhite
8f3822b8c9
Merge pull request #51365 from waynew/py2-deprecation-warning
...
Add Python2 depreciation warning
2019-01-29 09:58:56 -05:00
twangboy
501234cc24
Fix issue when directory doesn't exist
2019-01-28 21:23:14 -07:00
Wayne Werner
f4a584e33b
Quieter warnings for now.
...
We want to throw them in now for salt master/minion startup, but by the
sodium release we'll want to put them back in `salt/__init__.py`,
because if they haven't upgraded to Python3 by that point then they
really really need to get on the ball!
2019-01-28 15:29:44 -06:00
Wayne Werner
a52284b990
Fix lint issues
2019-01-28 14:39:27 -06:00
Wayne Werner
14a6d64e30
Add Python2 depreciation warning
2019-01-28 11:01:50 -06:00
Gareth J. Greenaway
913a349b03
Merge pull request #51342 from twangboy/fix_test_jinja
...
Roll back some changes to _compat.py
2019-01-25 14:08:16 -08:00
twangboy
cbdf4c51c6
Roll back some changes to _compat.py
2019-01-25 14:04:24 -07:00
Megan Wilhite
c11838757e
Merge pull request #50974 from max-arnold/salt-call-executor-options
...
[Fluorine] Unify salt-call/salt executor arguments
2019-01-25 09:42:31 -05:00
Megan Wilhite
b49ac1e7ec
Merge pull request #51300 from twangboy/merge_context
...
Bring __context__ usage in LGPO to rc1
2019-01-25 09:21:13 -05:00
Gareth J. Greenaway
0af4675f8d
Merge pull request #51318 from garethgreenaway/51273_only_allow_auth_valid_parameters
...
[2019.2.0rc1] Fix to __auth_call
2019-01-24 14:27:00 -08:00
Gareth J. Greenaway
3dbe8dc8be
When making auth calls, only username, password, auth, and token are valid, so we strip anything else out.
2019-01-24 12:45:35 -08:00
Megan Wilhite
9d487f20ec
Merge branch '2019.2.0.rc1' into merge_context
2019-01-24 11:09:57 -05:00
Megan Wilhite
a57b1e2c6c
Merge branch '2019.2.0.rc1' into salt-call-executor-options
2019-01-24 11:05:49 -05:00
Pedro Algarvio
d6f4f055f5
Merge pull request #51298 from terminalmage/issue51258
...
Fix edge case when minion ID is a 16-character string
2019-01-24 11:42:01 +00:00
Pedro Algarvio
f94e721e75
Merge branch '2019.2.0.rc1' into issue51258
2019-01-24 11:41:48 +00:00
Pedro Algarvio
cd5b50399a
Merge pull request #51296 from Ch3LL/bp-51285
...
Backport #51285 into 2019.2.0.rc1
2019-01-24 09:34:05 +00:00
twangboy
3ed7b84792
Use __context__ in LGPO module
2019-01-23 14:22:35 -07:00
Megan Wilhite
7fa04212a3
Merge pull request #51223 from twangboy/merge_auditpol
...
Bring auditpol support to rc1
2019-01-23 15:48:21 -05:00
Erik Johnson
3649bb063f
Fix edge case when minion ID is a 16-character string
...
Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.
2019-01-23 14:29:36 -06:00
Gareth J. Greenaway
6e869d0a19
Ensure metadata is an accepted keyword argument for authentication functions.
2019-01-23 14:17:35 -05:00
Pedro Algarvio
8850b37d45
Merge pull request #51176 from twangboy/update_req_osx
...
Update dependencies in req.txt for OSX
2019-01-23 07:28:52 +00:00
Pedro Algarvio
d4d401b5d9
Merge branch '2019.2.0.rc1' into update_req_osx
2019-01-23 07:28:41 +00:00
Pedro Algarvio
411d682874
Merge pull request #51175 from twangboy/update_req_windows
...
Update dependencies in req.txt for Windows
2019-01-23 07:27:38 +00:00
Pedro Algarvio
7a05c1991b
Merge branch '2019.2.0.rc1' into update_req_windows
2019-01-23 07:27:23 +00:00
Pedro Algarvio
eab0a2aaa9
Merge pull request #51286 from twangboy/skip_test_cp
...
Skip test_get_file_templated_paths on Windows/Py3
2019-01-23 07:07:24 +00:00
twangboy
9464af259a
Skip test_getI_file_templated_paths on Windows/Py3
2019-01-22 15:42:37 -07:00
Thomas S Hatch
2cc617adf7
Merge pull request #51283 from Ch3LL/lint_2019
...
Fix pylint for 2019.2
2019-01-22 15:19:07 -07:00
Ch3LL
1dd92a943a
Fix pylint for 2019.2
2019-01-22 13:38:45 -05:00
Pedro Algarvio
4df5b13e66
Update pytest requirements
2019-01-19 18:39:00 +00:00
Pedro Algarvio
6bdeae5a02
Move all of PyTest requirements to its own requiremnts file
2019-01-19 18:39:00 +00:00
Shane Lee
1b83427934
Merge branch '2019.2.0.rc1' into merge_auditpol
2019-01-18 15:43:06 -07:00
Gareth J. Greenaway
241eabe860
Merge pull request #51222 from s0undt3ch/2019.2.0.rc1
...
Make `AsyncPillar` API compatible with `AsyncRemotePillar` - Fixes #51186
2019-01-17 12:42:09 -08:00
twangboy
35adc8b272
Merge forward #51154 and #51184
2019-01-17 10:25:12 -07:00
Pedro Algarvio
430491b388
Make AsyncPillar API compatible with AsyncRemotePillar
...
Fixes #51186
2019-01-17 17:15:33 +00:00
twangboy
1d00b0543d
Rollback zeromq to 4.1.6
2019-01-16 14:22:22 -07:00
Daniel Wozniak
1dc57094c2
Merge pull request #51194 from terminalmage/fix-py3-incompatibility
...
Fix Python 3 incompatibility in EC2 salt-cloud driver
2019-01-16 11:01:33 -07:00
Erik Johnson
734db2f686
Fix Python 3 incompatibility in EC2 salt-cloud driver
2019-01-16 10:15:28 -06:00
twangboy
c64698968d
Backport pyobjc
2019-01-15 16:39:49 -07:00
twangboy
dcc74f2692
Rollback two dependencies
...
GitPython==2.1.10
CherryPy==17.4.1
2019-01-15 11:38:58 -07:00
twangboy
8d8a15c7ee
Rollback GitPython to 2.1.10
2019-01-15 11:36:40 -07:00
twangboy
ab38f89c1a
Downgrade CherryPy to 17.4.1
2019-01-14 20:46:58 -07:00
twangboy
ea0acbabf6
Update dependencies in req.txt for OSX
2019-01-14 17:39:29 -07:00
twangboy
3edfef31c1
Update dependencies in req.txt for Windows
2019-01-14 17:30:24 -07:00
Gareth J. Greenaway
5533e9ee96
Merge pull request #51172 from Ch3LL/bp-51000
...
Backport #51000 into 2019.2.0rc1
2019-01-14 14:31:59 -08:00
Gareth J. Greenaway
5f07654910
Merge branch '2019.2.0.rc1' into bp-51000
2019-01-14 14:29:36 -08:00
Brian Sidebotham
36c32cd1f0
Prevent valid return from virt-what creating unhandled exceptions
2019-01-14 17:28:20 -05:00
Daniel Wozniak
12459a4646
Merge pull request #51145 from dwoz/flaky_renderer
...
Mark renderer test as flaky for mac tests
2019-01-11 20:16:12 -07:00
