valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
84,011 Commits 24 Branches 182 Tags 341 MiB
136816c109
Commit Graph

84011 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ch3LL
8aab65c718
fix 2016.3.7 release notes merge conflict 2017-10-10 10:53:38 -04:00
Massimiliano Torromeo
a63e6ca963
Copy git ssh-id-wrapper to /tmp only if necessary (Fixes #10582, Fixes #19532) 
This adds a check that only copies the ssh wrapper to a temporary
location if git is to be run by a specific user and at the same time
the predefined wrapper file is not executable by "others" by verifying
every path part for the others executable bit.

By doing this the temp file is kept only as a last resort which should
work with salt-ssh as per bug #19532, while avoiding a needless copy
on /tmp which could be potentially mounted with noexec as per
bug #10582.
 2017-10-10 16:00:02 +02:00
Nicole Thomas
bd879eb66e Merge pull request #43952 from jdsieci/2017.7_add_requisites_to_stateconf 
add requisites to stateconf ( backport #43920)
 2017-10-10 09:03:31 -04:00
Mike Place
9994c64670 Merge branch '2017.7' into 2017.7_add_requisites_to_stateconf 2017-10-09 17:15:25 -06:00
Mike Place
a81b78381b Merge branch '2016.11' into 2016.11-fix-2291 2017-10-09 17:10:16 -06:00
Mike Place
e434c39c4e Merge pull request #43960 from cro/ldap_nopw_bind2 
Require that bindpw be non-empty when auth.ldap.anonymous is False
 2017-10-09 17:09:01 -06:00
Ivan Babrou
95ab901553
Report built-in modiles in kmod.available, fixes #43945 2017-10-09 15:44:02 -07:00
garethgreenaway
e9dfda2177 Merge pull request #43991 from Ch3LL/3.8_sec_2 
Add Security Notes to 2016.3.8 Release Notes
 2017-10-09 15:00:24 -07:00
Mike Place
2346d2691e Merge pull request #43968 from rossengeorgiev/fix-zenoss-prod_state 
fix zenoss state module not respecting test=true
 2017-10-09 15:27:29 -06:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes 2017-10-09 16:26:13 -04:00
Rossen Georgiev
e6d31c1ea6 fix zenoss state module not respecting test=true 2017-10-09 18:53:22 +01:00
garethgreenaway
8d56a5ac45 Merge pull request #43776 from Ch3LL/2016.11.8_docs 
[2016.11] Bump latest and previous versions
 2017-10-09 10:22:14 -07:00
garethgreenaway
a4358dfa36 Merge pull request #43777 from Ch3LL/2017.7.2_docs 
[2017.7] Bump latest and previous versions
 2017-10-09 10:21:56 -07:00
garethgreenaway
21bf71c3f5 Merge pull request #43976 from Ch3LL/11.8_sec 
Add Security Notes to 2016.11.8 Release Notes
 2017-10-09 10:20:53 -07:00
garethgreenaway
bd73dcb02c Merge pull request #43977 from Ch3LL/3.8_sec 
Add Security Notes to 2016.3.8 Release Notes
 2017-10-09 10:20:30 -07:00
garethgreenaway
2a064c1a72 Merge pull request #43978 from Ch3LL/7.2_sec 
Add Security Notes to 2017.7.2 Release Notes
 2017-10-09 10:20:03 -07:00
Ch3LL
57fd6f7bcb
Add Security Notes to 2017.7.2 Release Notes 2017-10-09 13:09:58 -04:00
Ch3LL
f0c3184288
Add Security Notes to 2016.11.8 Release Notes 2017-10-09 13:03:23 -04:00
Mike Place
1d5397ab5b Merge pull request #43973 from terminalmage/fix-grains.has_value 
Fix grains.has_value when value is False
 2017-10-09 08:59:19 -06:00
Erik Johnson
bf45ae6e6a
Fix grains.has_value when value is False 
This function returns a boolean based on the boolean result of the value
returned when looking up the key. However, this means that if a key
exists and has a value of 0, an empty string, or False/None,
grains.has_value will incorrectly return False. This fixes that by only
returning False when the key is not present.
 2017-10-09 08:21:12 -05:00
C. R. Oldham
962a20cf4b
Require that bindpw be non-empty if auth.ldap.anonymous=False 2017-10-06 15:41:07 -06:00
C. R. Oldham
9df3d91d8f
Release notes blurb for change to bindpw requirements 2017-10-06 15:33:10 -06:00
Mike Place
d9530e3c52 Merge pull request #43932 from techhat/moddict 
Don't try to modify dict while looping through it
 2017-10-06 15:20:53 -06:00
Mike Place
39893a1dab Merge pull request #43956 from terminalmage/fix-get_url-redirects 
Fix fileclient's get_url when redirecting to a redirect
 2017-10-06 15:19:41 -06:00
Mike Place
1baf286719 Merge pull request #43943 from twangboy/win_unit_test_utils 
Fix `unit.utils.test_utils` for Windows
 2017-10-06 13:35:23 -06:00
Erik Johnson
9a4f6a260f
Fix fileclient's get_url when redirecting to a redirect 
When a 30x leads to a 200 OK, we properly reset write_body[0] so that we
save the body of the response. However, when both A) a 30x redirects to
another 30x and B) we've already determined the encoding from the
Content-Type (and thus set write_body[2]), then we don't properly set
write_body[0], resulting in a zero-length file. This commit fixes this
by also resetting the write_body[2] when following redirects, so that we
make sure we are getting the encoding for the request to the URL that
resulted in the 200 instead of the one that resulted in the 30x.
 2017-10-06 13:51:06 -05:00
Pablo Suárez Hernández
44bc91bb98
Enable '--with-salt-version' parameter for setup.py script 2017-10-06 17:12:15 +01:00
JerzyX Drozdz
89200ff28e rebase from 2017.7.2 2017-10-06 13:18:16 +02:00
Nicole Thomas
a8f1750323 Merge pull request #43939 from terminalmage/fix-typo 
Fix typo in log message
 2017-10-05 19:20:04 -04:00
Corvin Mcpherson
fefd28d896 Add futureproofing to roster_defaults to support roster dictionary options 2017-10-05 19:04:05 -04:00
twangboy
254dac7723
Fix unit.utils.test_utils for Windows 
Use os agnostic path seps
Mock sys.platform to not return win
 2017-10-05 16:47:32 -06:00
Nicole Thomas
1a718eb1ed Merge pull request #43910 from terminalmage/issue43605 
Don't put unserializable dict.keys() into state return
 2017-10-05 16:33:46 -04:00
Nicole Thomas
a7a59868c8 Merge pull request #43927 from rallytime/bp-43907 
Back-port #43907 to 2017.7
 2017-10-05 16:10:15 -04:00
Nicole Thomas
9ac3f2ea7b Merge pull request #43888 from rallytime/bp-43841 
Back-port #43841 to 2016.11
 2017-10-05 16:09:57 -04:00
Nicole Thomas
4fcd4709ea Merge pull request #43934 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-05 16:07:35 -04:00
Erik Johnson
29d8cf4f26
Fix typo in log message 
``UNCH`` should have been ``UNC``.
 2017-10-05 14:54:04 -05:00
Nicole Thomas
7d174172a0 Merge pull request #43886 from techhat/azuredict 
Fix object_to_dict in azure
 2017-10-05 15:33:55 -04:00
Nicole Thomas
f880ac4c08 Merge pull request #43916 from dereckson/fix-typo-cloud-scaleway 
Fix typo in salt-cloud scaleway documentation
 2017-10-05 14:57:59 -04:00
rallytime
eaca3291e2
Merge branch '2016.11' into '2017.7' 
Conflicts:
  - tests/unit/modules/test_state.py
 2017-10-05 12:09:40 -04:00
Joseph Hall
4a77560646
Don't try to modify dict while looping through it 2017-10-05 09:51:38 -06:00
Richard Simko
f62e8ca87f
Make sure volume exists before querying 2017-10-05 09:09:40 -04:00
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation 
s/scalewa/scaleway
 2017-10-04 23:23:00 +00:00
Erik Johnson
042e092ac8
Don't put unserializable dict.keys() into state return 
Running ``list()`` on the dictionary produces the same list, and has the
benefit of not catastrophically failing on Python 3.
 2017-10-04 12:01:14 -05:00
Mike Place
7038248820 Merge pull request #43899 from gtmanfred/2017.7 
enable tox for tests
 2017-10-04 09:08:15 -06:00
Mike Place
a5abe33e1c Merge pull request #43828 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-10-04 07:10:12 -06:00
Nicole Thomas
2ab7549d48 Merge pull request #43884 from UtahDave/2016.11local 
Update SaltConf banner per Rhett's request
 2017-10-04 09:08:29 -04:00
Daniel Wallace
51eca1a6bd
enable tox for tests 2017-10-03 17:01:19 -06:00
garethgreenaway
e3b2857285 Merge branch '2016.11' into 2016.11local 2017-10-03 11:50:29 -07:00
apapp
87d676f08a
add -n with netstat so we don't resolve 2017-10-03 13:32:30 -04:00
Joseph Hall
223a1eea83 Fix object_to_dict in azure 2017-10-03 11:11:42 -06:00