Gareth J. Greenaway
cd336ed822
Merge branch '2018.3' into ldap-groups
2019-01-02 18:49:00 -08:00
Gareth J. Greenaway
4685e0ef5f
Merge pull request #50972 from pirogoeth/sjohn/2018.3-apt-key-batch
...
Use gpg's --batch in apt-key adv during repo key add
2019-01-02 18:34:12 -08:00
Gareth J. Greenaway
cd3d755134
Merge branch '2018.3' into sjohn/2018.3-apt-key-batch
2019-01-02 17:55:58 -08:00
Gareth J. Greenaway
44bc86218f
Merge pull request #51028 from whytewolf/aix_lsattr_fix
...
AIX lsattr fix for file module.
2019-01-02 17:52:33 -08:00
Thomas Phipps
1b733c6041
Set lsattr functions to return None if salt.utils.platform.is_aix
...
returns true.
This should fix https://github.com/saltstack/salt/issues/49089
2019-01-02 13:01:28 -08:00
Sean Johnson
7410008716
Merge branch '2018.3' into sjohn/2018.3-apt-key-batch
2019-01-02 13:07:15 -06:00
Pedro Algarvio
b4774a8eab
Merge pull request #51018 from garethgreenaway/merge-2018.3
...
[fluorine] Merge forward from 2017.7 to 2018.3
2019-01-01 23:11:01 +00:00
Gareth J. Greenaway
12f75834aa
Merge branch '2017.7' into merge-2018.3
...
Conflicts:
- pkg/osx/req.txt
- pkg/windows/req.txt
2019-01-01 13:35:41 -08:00
Adam Mendlik
94f8ee4a7b
Update unit tests for auth.ldap
2018-12-31 14:34:10 -07: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
Adam Mendlik
08e36d0c48
Allow unauthenticated bind for listing LDAP groups
...
This fix was originally made in PR #45347 , then pulled into another
branch under PR #45811 , but was clobbered by c3f1587fdb
2018-12-30 20:15:25 -07: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
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
45291506e8
Merge pull request #50977 from rallytime/config-docs
...
Add documentation for a few config values
2018-12-28 13:57:57 -07:00
Thomas S Hatch
0e925282e4
Merge branch '2018.3' into win_wusa
2018-12-28 13:55:12 -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
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
Daniel Wozniak
409594bcb8
Merge pull request #50991 from twangboy/requests_2017.7
...
Requests 2017.7
2018-12-28 12:28:03 -07: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
twangboy
6285b64e0e
Update win_wusa and add tests
2018-12-27 17:29:47 -07:00
twangboy
32b9d2ad25
Update requests for osx
2018-12-27 12:03:00 -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
twangboy
413dc72600
Merge branch '2017.7' of https://github.com/saltstack/salt into requests_2017.7
2018-12-27 11:59:28 -07:00
twangboy
4196690bbf
Update requests to 2.21.0
2018-12-27 11:58:46 -07:00
Gareth J. Greenaway
3cfca8ee64
Merge branch '2018.3' into merge-2017.7
2018-12-26 15:36:50 -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
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
Thomas S Hatch
e05307420d
Merge pull request #50983 from garethgreenaway/bp-50885
...
Back-port PR #50885 to 2017.7
2018-12-26 12:29:30 -07:00
bbh-kmd
20fa5c99b6
Update sudo.py
2018-12-26 11:22:18 -08:00
Rémi Jouannet
09a8e6e7f7
fix a del in cloud vmware that crash when the key isn't there
2018-12-26 11:15:51 -08: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
rallytime
43c39e7408
Add documentation to master config docs for job_cache_store_endtime
2018-12-24 14:22:25 -05:00
rallytime
887cd070ca
Add some salt-api options to the master config docs
2018-12-24 14:22:25 -05:00
rallytime
0d49746de8
Fix some formatting in master config docs
2018-12-24 14:22:24 -05:00
Sean Johnson
773bf314a6
Use gpg's --batch in apt-key adv during repo key add
2018-12-22 18:23:32 -06: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
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
773b983dff
Merge branch '2018.3' into ipv6-warnings
2018-12-21 12:27:20 -08:00
