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
92,672 Commits 24 Branches 182 Tags 341 MiB
120ee16b70
Commit Graph

92672 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
cb04d9c37e
Merge pull request #47661 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-05-16 11:53:35 -04:00
David Murphy
220f887fa6 Fixed review comment, changed file.chown to file.makedirs_perms 2018-05-16 09:48:22 -06:00
David Murphy
b15a1652b5 Changed versionadded from 2018.3.1 to 2018.3.2, to reflect when change should be accepted 2018-05-16 09:45:47 -06:00
David Murphy
90eb03e375 Additional error checking and minor cleanup 2018-05-16 09:45:47 -06:00
David Murphy
40d77e03d2 Correct building rpms with non-root user 2018-05-16 09:45:47 -06:00
Pablo Suárez Hernández
0232a6e1ad
Add 'other' as valid kwargs for 'user.add' method 2018-05-16 16:12:34 +01:00
Erik Johnson
28a7d2b81c
Skip __exclude__ in find_sls_ids 
The corresponding value would be a list and thus raises a TypeError when
attempting to perform a dict lookup.
 2018-05-16 10:11:31 -05:00
Nicole Thomas
d17a16b648
Merge pull request #47672 from terminalmage/bp-47487 
Backport #47487 to 2018.3
 2018-05-16 09:55:39 -04:00
Nicole Thomas
9d4f5203a7
Merge pull request #47504 from mateiw/2018.3-salt-ssh-pillar-propagation-issue-47501 
Fix pillar propagation in salt-ssh when overriding pillar in module.run + state.apply
 2018-05-16 09:55:04 -04:00
Nicole Thomas
4fe78bbb9b
Merge pull request #47212 from weswhet/fix-macos-runas 
fix macOS running as user.
 2018-05-16 09:54:22 -04:00
Nicole Thomas
a2ed8cbb7f
Merge pull request #47151 from zer0def/configparser-defaultsect 
Allow interaction with default section in ConfigParser serializer
 2018-05-16 09:53:43 -04:00
Nicole Thomas
e6fb8342ef
Merge pull request #47673 from terminalmage/bp-45808 
Backport #45808 to 2017.7
 2018-05-16 09:52:04 -04:00
Nicole Thomas
0c7439a955
Merge pull request #47674 from terminalmage/issue47587 
Fix regression in table outputter due to unicode types
 2018-05-16 09:41:03 -04:00
Erik Johnson
43e3dcd398
Fix Python 3 incompatibility in table outputter 
`map(None, some_iterable)` is not valid usage in Python 3. This fixes
that incompatiblity in a way that works in both Python 2 and 3.
 2018-05-16 00:04:49 -05:00
Erik Johnson
d729656703
Add unit tests for table outputter 2018-05-16 00:02:14 -05:00
Erik Johnson
907d182dea
Fix regression in table outputter due to unicode strings 
This ensures that we use the proper justification functions from the
unicode type on Python 2, and that we also normalize the input so that
we are guaranteed that all strings are unicode types.
 2018-05-15 23:53:20 -05:00
andrei
454291ad62
Fix errors when attempting to cache files with long names or URLs 2018-05-15 22:39:09 -05:00
Ross Crawford-d'Heureuse
12abbfdcf7
bad ref to error fix 2018-05-15 21:34:52 -05:00
Daniel Wallace
b0446aab07
Merge pull request #47670 from gtmanfred/2017.7 
add a pytest.ini and update a dependency for kitchen
 2018-05-15 20:56:16 -05:00
Daniel Wallace
dfd5a8715f
add a pytest.ini and update a dependency for kitchen 2018-05-15 20:55:18 -05:00
Daniel Wallace
0d06da6944
Merge pull request #47626 from gtmanfred/2017.7 
Implement Pipfile and remove extra requirements.txt files
 2018-05-15 19:03:11 -05:00
Ch3LL
a8981024de
Add pkg.latest_version windows test 2018-05-15 16:20:55 -04:00
Ch3LL
ba40d3d1a1
Update test_mac_user_enable_auto_login to test both py2 and py3 2018-05-15 14:40:54 -04:00
Nicole Thomas
a07a8906a0
Merge pull request #47578 from Ch3LL/mac_service_disabled 
Ensure mac_service.disabled is correctly querying services
 2018-05-15 14:26:36 -04:00
Nicole Thomas
fb3bf1ff3e
Merge pull request #47664 from rallytime/bp-47645 
Back-port #47645 to 2018.3.1
 2018-05-15 14:25:27 -04:00
Daniel Wallace
fd8a02decb
use dictupdate to update the providers dictionary and merge lists 2018-05-15 13:03:35 -05:00
Daniel Wallace
418364a533
make dev_python27.txt have the same message as dev_python34.txt 2018-05-15 12:29:52 -05:00
Ch3LL
0a732d8e66
query the pip path for test test_issue_2087_missing_pip 2018-05-15 13:17:54 -04:00
Nicole Thomas
a4921e86c9
Merge pull request #47645 from Ch3LL/py3_rm_pip 
query the pip path for test test_issue_2087_missing_pip
 2018-05-15 13:16:10 -04:00
rallytime
dd3e6f3f0a
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - doc/man/salt-api.1
  - doc/man/salt-call.1
  - doc/man/salt-cloud.1
  - doc/man/salt-cp.1
  - doc/man/salt-key.1
  - doc/man/salt-master.1
  - doc/man/salt-minion.1
  - doc/man/salt-proxy.1
  - doc/man/salt-run.1
  - doc/man/salt-ssh.1
  - doc/man/salt-syndic.1
  - doc/man/salt-unity.1
  - doc/man/salt.1
  - doc/man/salt.7
  - doc/man/spm.1
  - salt/states/pkgrepo.py
 2018-05-15 12:29:29 -04:00
Ch3LL
6032a01f55
change disable check for upstart service on ubuntu14 2018-05-15 12:07:27 -04:00
Nicole Thomas
d1a1a594e9
Merge pull request #47617 from aesposito91/2018.3 
Update napalm.py
 2018-05-15 11:44:34 -04:00
Nicole Thomas
049abe2850
Merge pull request #47649 from paulcollinsiii/sentry_docs 
Some additional details about Sentry for the docs
 2018-05-15 11:41:35 -04:00
Nicole Thomas
8a21b864df
Merge pull request #47642 from garethgreenaway/unicode_update_salt_extend_templates 
[2018.3] Updating templates used by salt-extend for unicode goodness
 2018-05-15 11:38:25 -04:00
Nicole Thomas
ff861d9089
Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields 2018-05-15 11:37:58 -04:00
Nicole Thomas
3ffa412ee5
Merge branch '2018.3' into 2018.3-salt-ssh-pillar-propagation-issue-47501 2018-05-15 11:15:02 -04:00
Nicole Thomas
a8f2ad977e
Merge branch '2017.7' into configparser-defaultsect 2018-05-15 10:50:09 -04:00
Nicole Thomas
9039fee104
Merge pull request #47647 from rallytime/bp-47601-and-47643-2018.3.1 
Back-port #47601 and #47643 to 2018.3.1
 2018-05-15 10:07:53 -04:00
Nicole Thomas
e441733ac1
Merge pull request #47646 from rallytime/bp-47601-and-47643 
Back-port #47601 and #47643 to 2017.7.6
 2018-05-15 10:04:44 -04:00
Nicole Thomas
99f53c0a9f
Merge pull request #47603 from terminalmage/more-test-renaming 
Move/merge more test modules
 2018-05-14 16:48:42 -04:00
Daniel A. Wozniak
7214fe17c8
Fix typo 2018-05-14 15:52:41 -04:00
Daniel A. Wozniak
506dceed17
Remove unwanted file 2018-05-14 15:52:35 -04:00
Daniel A. Wozniak
b6a21dfda3
use ignore-undefined-variable 2018-05-14 15:52:30 -04:00
Daniel A. Wozniak
2429f9fe8a
Ignore pylint WindowsError 2018-05-14 15:52:26 -04:00
Daniel A. Wozniak
2d63682fea
Better doc string 2018-05-14 15:52:22 -04:00
Daniel A. Wozniak
ec2adff699
Skip tests when we can not use runas 2018-05-14 15:52:17 -04:00
Daniel A. Wozniak
9e1d1a5ef8
Fix typo 2018-05-14 15:49:36 -04:00
Daniel A. Wozniak
4e94609136
Remove unwanted file 2018-05-14 15:49:31 -04:00
Daniel A. Wozniak
0109249c78
use ignore-undefined-variable 2018-05-14 15:49:20 -04:00
Daniel A. Wozniak
37caecb7f4
Ignore pylint WindowsError 2018-05-14 15:49:15 -04:00