Commit Graph

87012 Commits

Author SHA1 Message Date
Ivan Babrou
95ab901553
Report built-in modiles in kmod.available, fixes #43945 2017-10-09 15:44:02 -07:00
Benedikt Werner
da0749cc05
Improved sensehat execution module documentation 2017-10-10 00:13:57 +02:00
garethgreenaway
82b92a20b9 Merge branch 'develop' into vagrant-module 2017-10-09 15:09:25 -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
Mike Place
bd557c1017 Merge pull request #43974 from isbm/isbm-tgttype-fix-dev
Bugfix: always return a string "list" on unknown job target type.
2017-10-09 15:25:15 -06:00
Ch3LL
1977df8462
Add Security Notes to 2016.3.8 Release Notes 2017-10-09 16:26:13 -04:00
Mike Place
82b81e608a Merge pull request #43981 from cachedout/radon_exclude_templates
Exclude templates in radon codeclimate test
2017-10-09 12:05:53 -06:00
Mike Place
d41de4ec16
Exclude templates in radon codeclimate test 2017-10-09 12:03:10 -06:00
Rossen Georgiev
e6d31c1ea6 fix zenoss state module not respecting test=true 2017-10-09 18:53:22 +01:00
Mike Place
efbe49fe60 Merge branch 'develop' into vagrant-module 2017-10-09 11:43:42 -06:00
Mike Place
fc931c64c9 Merge pull request #43979 from cachedout/lower_radon
Lower the radon threshold for CodeClimate
2017-10-09 11:40:20 -06:00
Mike Place
b8507c90ec
Lower the radon threshold for CodeClimate
Lower to 'D' which is cyclomatic complexity "moderate" or above.

More info on grading: http://radon.readthedocs.io/en/latest/commandline.html
2017-10-09 11:31:54 -06:00
garethgreenaway
80d258be0c Merge pull request #43775 from Ch3LL/develop_docs
[develop] Bump latest and previous versions
2017-10-09 10:22:27 -07: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
garethgreenaway
76ff44bc84 Merge branch 'develop' into vagrant-module 2017-10-09 09:06:42 -07:00
Bo Maryniuk
1dc298c5eb Bugfix: always return a string "list" on unknown job target type. 2017-10-09 17:57:48 +02:00
garethgreenaway
1ff27a4b2b Merge pull request #43842 from vernondcole/unit-test-sdb
provide a unit test for the sdb utility
2017-10-09 08:00:23 -07: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
Stephan Looney
045c409784
Removed unused six and additional code cleanup 2017-10-07 09:33:34 -04:00
Kunal Ajay Bajpai
603570a978 Merge branch 'fix_id_cache' of https://github.com/kunal-bajpai/salt into fix_id_cache 2017-10-07 11:13:35 +05:30
Kunal Ajay Bajpai
f5a8682f95 Check before creating dir 2017-10-07 11:13:21 +05:30
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
Joseph Hall
10282a0fe7
Typo 2017-10-06 14:42:30 -06:00
Mike Place
93c4c39ab7 Merge branch 'develop' into fix_id_cache 2017-10-06 13:45:00 -06:00
Mike Place
4c728301c7 Merge branch 'develop' into add-missing-param-lxc-proxmox-driver 2017-10-06 13:37:21 -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
Daniel Wallace
1f8ec5d335 Merge branch 'develop' into vagrant-module 2017-10-06 11:32:31 -06:00
Kunal Ajay Bajpai
10966d6ab0 Merge branch 'fix_id_cache' of https://github.com/kunal-bajpai/salt into fix_id_cache 2017-10-06 22:02:12 +05:30
Kunal Ajay Bajpai
5a852c815c Do not raise exception 2017-10-06 22:02:06 +05:30
Pablo Suárez Hernández
44bc91bb98
Enable '--with-salt-version' parameter for setup.py script 2017-10-06 17:12:15 +01:00
garethgreenaway
11c7d3ab39 Merge branch 'develop' into unit-test-sdb 2017-10-06 07:28:42 -07:00
Joseph Hall
11e577b9ce
Add deps message to __virtual__() 2017-10-06 07:55:04 -06:00
Nicole Thomas
d136650b31 Merge pull request #43938 from terminalmage/salt.utils.user
Move several functions from salt.utils to salt.utils.user
2017-10-06 09:42:42 -04:00
Massimiliano Torromeo
63961cc7d9 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-06 15:00:52 +02:00
JerzyX Drozdz
89200ff28e rebase from 2017.7.2 2017-10-06 13:18:16 +02:00
Arthur Lutz
4ce20bb2f7 [log/sentry] avoid KeyError: 'SENTRY_PROJECT'
if compute_scope is not present on transport registry, we can't
update options dictionnary with empty dsn_config dictionary

fix  #43949
2017-10-06 13:10:34 +02:00
pierre.bellicini
6d36a9f9fa
Merge branch 'add-missing-param-lxc-proxmox-driver' of github.com:cavepopo/salt into add-missing-param-lxc-proxmox-driver 2017-10-06 10:34:17 +02:00
pierre.bellicini
08f59a0962
fix missing space after cores in lxc section
modified:   salt/cloud/clouds/proxmox.py
2017-10-06 10:33:53 +02:00