valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
95,951 Commits 24 Branches 182 Tags 341 MiB
4e855050e8
Commit Graph

95951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
3395a3d185
Merge branch '2017.7' into bugfix-2017.7/ubuntu-networking-searchdomain 2019-01-07 11:52:27 -08:00
Gareth J. Greenaway
027804a55b
Merge branch '2018.3' into merge-2018.3 2019-01-07 10:53:53 -08:00
Gareth J. Greenaway
335088b96f
Merge pull request #51080 from garethgreenaway/50966_nxos_ensure_kwargs_list 
[2018.3] Fix to nxos module
 2019-01-07 10:07:24 -08:00
Gareth J. Greenaway
a20791b7c0
Merge branch '2018.3' into merge-2018.3 2019-01-07 09:46:43 -08:00
Gareth J. Greenaway
9386aab9da
Merge branch '2017.7' into merge-2018.3 2019-01-07 09:42:55 -08:00
Gareth J. Greenaway
230a66b901
Merge branch '2018.3' into 50966_nxos_ensure_kwargs_list 2019-01-07 08:46:34 -08:00
Gareth J. Greenaway
c47b6462c2
Merge pull request #51079 from terminalmage/salt-jenkins-1238 
Fix shadow.set_date/shadow.set_expire on F28
 2019-01-07 08:28:35 -08:00
Gareth J. Greenaway
629dc252c2
Ensure kwargs is a list before we attempt to loop through. Similar fix to 430c462f34 in the proxy module. 2019-01-07 08:23:14 -08:00
Erik Johnson
ccd5c151dc
Fix shadow.set_date/shadow.set_expire on F28 
When there are problems with SSSD, warnings are written to stderr but
as long as chage succeeds, the command will exit with a zero exit code.

These two functions were returning True only when there is no CLI
output, instead of checking the retcode as it should have.

This commit fixes this, allowing F28 (and any other distros which use
SSSD) to properly report success/failure when there are SSSD warnings in
the output from chage.
 2019-01-07 09:59:41 -06:00
James Howe
568e4fba0c
Revert add -> check 2019-01-07 14:37:12 +00:00
James Howe
4d7ebe7949
Typos in index_template_present documentation 2019-01-07 13:31:30 +00:00
Mircea Ulinic
71913ffb12
Merge branch '2017.7' into fix-capirca 2019-01-04 21:02:20 +00:00
Mircea Ulinic
6fc3484cb8 Lint? 2019-01-04 20:46:02 +00:00
Gareth J. Greenaway
aeeb047f18
Merge pull request #51044 from terminalmage/issue47043 
archive.extracted: Don't run lsattr when enforcing user/group ownership
 2019-01-03 11:26:02 -08:00
Erik Johnson
787b79a1b2
archive.extracted: Don't run lsattr when enforcing user/group ownership 
This changes file.check_perms such that it doesn't run lsattr if no
attrs are passed in.
 2019-01-03 10:19:56 -06:00
Erik Johnson
04fdae5bbd
Merge pull request #51034 from garethgreenaway/bp-51031 
Back-port PR #51031 to 2018.3
 2019-01-03 09:42:21 -06:00
Gareth J. Greenaway
cd336ed822
Merge branch '2018.3' into ldap-groups 2019-01-02 18:49:00 -08:00
Wayne Werner
cd310c2501
Set long_description 
It's good to have information on PyPI if people are looking there.

---

Closes saltstack/salt#50964

Signed-off-by: Wayne Werner <wwerner@saltstack.com>
 2019-01-02 18:40:59 -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
Gareth J. Greenaway
998fecaee8
Merge pull request #51030 from terminalmage/issue38502 
Add unit test to ensure we don't diff bare repos
 2019-01-02 17:50:26 -08:00
Erik Johnson
6dbd81fb4b
Add unit test to ensure we don't diff bare repos 
Resolves #38502.
 2019-01-02 15:43:16 -06: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. This commit
just restores the fix.
 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