Gareth J. Greenaway
09815e7f77
Merge branch '2018.3' into merge-fluorine
...
Conflicts:
- salt/states/win_lgpo.py
- salt/utils/minions.py
2019-01-01 13:50:01 -08:00
Daniel Wozniak
c53723a7a9
Merge pull request #50990 from twangboy/requests_2018.3
...
Requests 2018.3
2018-12-31 13:19:01 -07:00
Daniel Wozniak
cecd108aff
Merge pull request #51004 from twangboy/win_wusa
...
Add tests for the win_wusa state and module
2018-12-31 13:03:29 -07:00
Daniel Wozniak
3e0515b66c
Merge pull request #51014 from madrisan/patch-1
...
ssh module: missing space in error message
2018-12-31 12:59:18 -07:00
Daniel Wozniak
582d6b42d4
Merge pull request #50883 from terminalmage/bp-49622
...
Backport #49622 to 2018.3 branch
2018-12-31 12:58:10 -07:00
Davide Madrisan
ab980fb195
ssh module: missing space in error message
2018-12-31 17:41:27 +01:00
Pedro Algarvio
e00cbbaca0
Merge pull request #50952 from garethgreenaway/merge-fluorine
...
[fluorine] Merge forward from 2018.3 to fluorine
2018-12-30 18:07:40 +00:00
Gareth J. Greenaway
35af7f56a4
Merge branch 'merge-fluorine' of github.com:garethgreenaway/salt into merge-fluorine
2018-12-29 21:44:30 -08:00
Gareth J. Greenaway
ae2f2b1c9a
Adding in Windows related core grain code that got removed in merge.
2018-12-29 21:44:09 -08:00
Daniel Wozniak
fd9711b461
Merge pull request #50945 from garethgreenaway/merge-2017.7
...
[2018.3] Merge forward from 2017.7 to 2018.8
2018-12-29 17:05:45 -07:00
Gareth J. Greenaway
df6b3c875f
Merge branch 'fluorine' into merge-fluorine
2018-12-29 12:08:59 -08:00
Gareth J. Greenaway
43b3fa4e4d
Merge branch '2018.3' into merge-2017.7
2018-12-29 12:08:55 -08:00
Thomas S Hatch
b8615e1564
Merge pull request #51006 from dwoz/backport_50855
...
Let minions try to connect to master indefinitly
2018-12-28 14:10:39 -07:00
Thomas S Hatch
0e925282e4
Merge branch '2018.3' into win_wusa
2018-12-28 13:55:12 -07:00
Thomas S Hatch
9f9e17f377
Merge pull request #51003 from s0undt3ch/hotfix/deprecate-transport-channel
...
Optionally include line number in caller_name
2018-12-28 13:53:28 -07:00
Thomas S Hatch
cfed697e31
Merge pull request #51005 from garethgreenaway/50989_fixing_junos_state_arguments
...
[2018.3] Fixes to junos state module
2018-12-28 13:51:30 -07:00
Daniel A. Wozniak
5563631f39
Let minions try to connect to master indefinitly
2018-12-28 12:55:46 -07:00
Gareth J. Greenaway
9b5580d1a9
Merge branch 'fluorine' into merge-fluorine
2018-12-28 11:51:15 -08:00
Gareth J. Greenaway
d4ac180209
Fixing the arguments accepted by cli function in the junos state module which are passed along to the cli function in junos module, so they align.
2018-12-28 11:36:16 -08:00
twangboy
c0d2495713
Fix lint, add test docs
2018-12-28 12:18:48 -07:00
twangboy
17502700fc
Add state tests for win_wusa
2018-12-28 11:57:23 -07:00
Pedro Algarvio
b336b1cf59
Optionally include line number in caller_name
2018-12-28 18:33:45 +00:00
Thomas S Hatch
90e26db585
Merge pull request #50996 from s0undt3ch/hotfix/deprecate-transport-channel
...
Stop using the deprecated `salt.transport.Channel.factory`
2018-12-28 10:40:44 -07:00
Pedro Algarvio
0f5525dcc2
Fix mocking
2018-12-28 13:22:09 +00:00
Pedro Algarvio
a78af22208
Lint fix
2018-12-28 12:08:41 +00:00
Pedro Algarvio
ea52307cf5
Stop using the deprecated salt.transport.Channel.factory
2018-12-28 12:01:13 +00:00
twangboy
6285b64e0e
Update win_wusa and add tests
2018-12-27 17:29:47 -07:00
twangboy
e8b92338e9
Update requests on osx
2018-12-27 12:02:19 -07:00
twangboy
b22856f8ed
Update requests to 2.21.0
2018-12-27 12:01:15 -07:00
twangboy
242389b151
Merge branch '2018.3' of https://github.com/saltstack/salt into requests_2018.3
2018-12-27 12:00:49 -07:00
Gareth J. Greenaway
3cfca8ee64
Merge branch '2018.3' into merge-2017.7
2018-12-26 15:36:50 -08:00
Gareth J. Greenaway
1275a18fa0
Merge branch 'merge-fluorine' of github.com:garethgreenaway/salt into merge-fluorine
2018-12-26 15:35:38 -08:00
Gareth J. Greenaway
f8d8bcd0d2
Fixing failing doc build tests.
2018-12-26 15:33:16 -08:00
Daniel Wozniak
daa591b1ac
Merge pull request #50982 from twangboy/fix_lgpo_2018.3
...
Fix issue with LGPO when returning empty dict (2018.3)
2018-12-26 12:58:11 -07:00
Gareth J. Greenaway
6170fa597c
Merge branch '2018.3' into merge-2017.7
2018-12-26 11:30:54 -08:00
Gareth J. Greenaway
02695866d4
Merge branch 'fluorine' into merge-fluorine
2018-12-26 11:30:37 -08:00
Thomas S Hatch
110bc66730
Merge pull request #50984 from garethgreenaway/bp-50959
...
Back-port PR #50959 to 2018.3
2018-12-26 12:29:53 -07:00
bbh-kmd
20fa5c99b6
Update sudo.py
2018-12-26 11:22:18 -08:00
Daniel Wozniak
4faa4b9c74
Merge pull request #50969 from twangboy/fix_lgpo
...
Fix issue with LGPO when returning empty dict
2018-12-26 11:41:32 -07:00
twangboy
d942934872
Get rid of requests import (CaseInsensitiveDict)
2018-12-26 11:37:00 -07:00
Daniel Wozniak
8fc89a0579
Merge pull request #50958 from bdrung/fix-twilio
...
Fix twilio version checking
2018-12-25 03:46:15 -07:00
twangboy
ca1df0d723
Fix order
2018-12-21 16:12:50 -07:00
Gareth J. Greenaway
d89c9b531a
Merge branch '2018.3' into merge-2017.7
2018-12-21 15:01:04 -08:00
Gareth J. Greenaway
cea01e7c8f
Updating valigdate_tgt to ensure tests pass.
2018-12-21 14:59:28 -08:00
twangboy
c4664cccc7
Get rid of requests import (CaseInsensitiveDict)
2018-12-21 15:59:19 -07:00
Gareth J. Greenaway
bb87822f0f
Merge pull request #50962 from terminalmage/ipv6-warnings
...
Remove redundant overrides for ip_address/ip_interface
2018-12-21 14:04:33 -08:00
Gareth J. Greenaway
b07ad83422
Fixing lint in salt/client/ssh/ssh_py_shim.py
2018-12-21 12:38:53 -08:00
Gareth J. Greenaway
773b983dff
Merge branch '2018.3' into ipv6-warnings
2018-12-21 12:27:20 -08:00
Gareth J. Greenaway
490a39dda5
Adding missing line back into doc/conf.py
2018-12-21 08:29:30 -08:00
Erik Johnson
f3b12547a2
Remove redundant overrides for ip_address/ip_interface
...
These cause spurious logging when there are IPv6 interfaces present.
Furthermore, these functions are both a) present in PY3's ipaddress
module, and b) present in the backported ipaddress module used in Salt
when the machine is running PY2.
2018-12-21 10:14:35 -06:00
