valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,803 Commits 24 Branches 182 Tags 341 MiB
d0d5726ffa
Commit Graph

99803 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gareth J. Greenaway
d08abf402f
Merge pull request #51081 from garethgreenaway/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2019-01-07 12:34:15 -08:00
Gareth J. Greenaway
03a82b22b8
Merge pull request #51083 from garethgreenaway/merge-fluorine 
[2019.2] Merge forward from 2018.3 to 2019.2
 2019-01-07 12:34:06 -08:00
Gareth J. Greenaway
3395a3d185
Merge branch '2017.7' into bugfix-2017.7/ubuntu-networking-searchdomain 2019-01-07 11:52:27 -08:00
Pedro Algarvio
bd6c46dfe3
Cleanup the singleton instances map. 
This prevents closed resources from being reused.
 2019-01-07 19:13:35 +00: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
2ea7404d73
Merge branch '2018.3' into merge-fluorine 
Conflicts:
	salt/modules/aptpkg.py
 2019-01-07 10:04:56 -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
Gareth J. Greenaway
c34a6cda36
Merge pull request #51066 from dwoz/cloud_unit 
Passwords are decoded to unicode
 2019-01-05 13:55:08 -08:00
Daniel A. Wozniak
a84ba300cb
Passwords are decoded to unicode 2019-01-05 13:40:16 -07: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
290f461963
Merge pull request #51061 from garethgreenaway/132_ec2_cloud_py3_test_failure 
[fluorine] fix to salt.utils.vt.Terminal
 2019-01-04 12:14:55 -08:00
Gareth J. Greenaway
7c893dbcc2
Merge branch 'fluorine' into 132_ec2_cloud_py3_test_failure 2019-01-04 11:14:14 -08:00
Gareth J. Greenaway
ea2b97c3bd
When writing output to stdout we want to ensure that the data is a string not bytes. Under py2 the salt.utils.data.encode function results in a string but under py3 the result is a bytestring. Swapping out salt.utils.data.encode for salt.utils.stringutils.to_str. 2019-01-04 10:57:21 -08:00
Gareth J. Greenaway
4b898ed6b3
Merge pull request #51041 from s0undt3ch/merge-singleton-last-ref-close-fluorine 
Don't close the pub_channel because it's being returned in the function
 2019-01-03 17:24:59 -08:00
Gareth J. Greenaway
2e26d03b01
Merge branch 'fluorine' into merge-singleton-last-ref-close-fluorine 2019-01-03 16:04:19 -08:00
Gareth J. Greenaway
db243e6fa3
Merge pull request #51021 from s0undt3ch/hotfix/pam-traceback-win 
Under Py3 `TypeError` can also be raised. Handle all kinds of exceptions
 2019-01-03 12:33:42 -08:00
Gareth J. Greenaway
ce38fd9a44
Merge branch 'fluorine' into hotfix/pam-traceback-win 2019-01-03 12:25:33 -08:00
Daniel Wozniak
342db5cc57
Merge pull request #51037 from dwoz/cloud_tests_fix 
[Fluorine] Cloud tests fix
 2019-01-03 12:35:33 -07: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
Pedro Algarvio
9ab0e98e2c
Make sure blackout tests clean up after themselves. Properly. 2019-01-03 19:19:16 +00:00
Erik Johnson
34e532d5ee
Merge pull request #51019 from garethgreenaway/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2019-01-03 10:58:37 -06:00
Pedro Algarvio
479439ab99
These should not be considered destructive tests 2019-01-03 16:20:07 +00: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
Pedro Algarvio
7ef05ab41b
Only run the closing routines if really closing. 2019-01-03 13:59:15 +00:00
Pedro Algarvio
52ea848edc
Don't close the pub_channel because it's being returned in the function 2019-01-03 11:08:17 +00:00
Pedro Algarvio
6ec502e0ea
Under Py3 TypeError can also be raised. Handle all kinds of exceptions. 
This was seen when running under windows:
```
14:13:11          test_invalid_kwargs_are_ignored (integration.client.test_runner.RunnerModuleTest)
14:13:11        [CPU:50.0%|MEM:24.0%]  ... 14:13:15,697 [salt.loader                                                                      :1572][ERROR   ] Failed to import auth pam, this is due most likely to a syntax error:
14:13:11        Traceback (most recent call last):
14:13:11          File "C:\\Users\\ADMINI~1\\AppData\\Local\\Temp\\kitchen\\testing\salt\loader.py", line 1548, in _load_module
14:13:11            mod = spec.loader.load_module()
14:13:11          File "<frozen importlib._bootstrap_external>", line 396, in _check_name_wrapper
14:13:11          File "<frozen importlib._bootstrap_external>", line 817, in load_module
14:13:11          File "<frozen importlib._bootstrap_external>", line 676, in load_module
14:13:11          File "<frozen importlib._bootstrap>", line 268, in _load_module_shim
14:13:11          File "<frozen importlib._bootstrap>", line 693, in _load
14:13:11          File "<frozen importlib._bootstrap>", line 673, in _load_unlocked
14:13:11          File "<frozen importlib._bootstrap_external>", line 673, in exec_module
14:13:11          File "<frozen importlib._bootstrap>", line 222, in _call_with_frames_removed
14:13:11          File "C:\Users\ADMINI~1\AppData\Local\Temp\kitchen\testing\salt\auth\pam.py", line 52, in <module>
14:13:11            LIBC = CDLL(find_library('c'))
14:13:11          File "C:\Python35\lib\ctypes\__init__.py", line 347, in __init__
14:13:11            self._handle = _dlopen(self._name, mode)
14:13:11        TypeError: bad argument type for built-in operation
14:13:18        OK (7.594s)
14:13:18          test_token (integration.client.test_runner.RunnerModuleTest)
14:13:26        [CPU:0.0%|MEM:24.1%]  ... args:
```
 2019-01-03 11:08:17 +00:00
Pedro Algarvio
69a943ec0b
Don't close the pub_channel because it's being returned in the function 2019-01-03 11:03:55 +00:00
Daniel A. Wozniak
cb453fc860
Fix service name on pypsexec 2019-01-02 20:57:16 -07: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
Gareth J. Greenaway
2a16a152be
Merge branch 'fluorine' into merge-fluorine 2019-01-02 17:01:09 -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
Erik Johnson
2c77ab4f95
Merge pull request #50997 from s0undt3ch/merge-singleton-last-ref-close-fluorine 
Last singleton instance, closes.
 2019-01-02 14:28:24 -06:00
Daniel A. Wozniak
ce1d96654d
Return password as unicode not bytes 2019-01-02 12:56:18 -07:00
Daniel A. Wozniak
460e9333e0
No xrange in py3 2019-01-02 12:38:33 -07:00