David A. Pocock
266dc00a23
Typo correction of lover to lower
2017-10-10 15:04:00 -05:00
Nicole Thomas
4fe029a0ab
Merge pull request #44024 from Ch3LL/7.3rn
...
Add 2017.7.3 Release Note File
2017-10-10 16:03:11 -04:00
Nicole Thomas
d61300df20
Merge pull request #44023 from Ch3LL/11.9rn
...
Add 2016.11.9 Release Note File
2017-10-10 16:03:01 -04:00
Nicole Thomas
e484d16817
Merge pull request #43998 from unthought/fix-gce-make_master
...
Fix gce make_master
2017-10-10 16:01:24 -04:00
Nicole Thomas
82b92d54b3
Merge pull request #44016 from terminalmage/issue44013
...
Fix on_header callback when not redirecting and no Content-Type present
2017-10-10 15:59:23 -04:00
Nicole Thomas
9ff53bf63a
Merge pull request #44019 from benediktwerner/2016.11
...
Added missing docs to the tutorial index and fixed spelling mistake
2017-10-10 15:57:05 -04:00
twangboy
00dbba5712
Fix unit.test_pillar for Windows
...
Use delete=True in NamedTemporaryFile command otherwise the handle to
the file isn't released and the file can't be opened by the actual test.
2017-10-10 13:44:58 -06:00
Ch3LL
027f509368
Add 2017.7.3 Release Note File
2017-10-10 15:33:42 -04:00
Ch3LL
7f9015eb41
Add 2016.11.9 Release Note File
2017-10-10 15:31:19 -04:00
Nicole Thomas
364523f5f8
Merge pull request #43955 from meaksh/2016.11-fix-2291
...
Enable a new '--with-salt-version' parameter for the "setup.py" script
2017-10-10 13:36:51 -04:00
Benedikt Werner
bc53598027
Fixed spelling mistake in salt_bootstrap tutorial
2017-10-10 19:03:07 +02:00
Benedikt Werner
6c30344824
Added missing tutorial docs to the tutorial index
2017-10-10 19:02:35 +02:00
Erik Johnson
d594b95f92
No need to set a specific encoding if one hasn't been provided via the headers
2017-10-10 11:36:58 -05:00
Nicole Thomas
fec714b91d
Merge pull request #43962 from bobrik/kmod-built-in
...
Report built-in modiles in kmod.available, fixes #43945
2017-10-10 12:31:39 -04:00
Erik Johnson
425ede4b84
Fix on_header callback when not redirecting and no Content-Type present
2017-10-10 11:24:57 -05:00
Daniel Mueller
6e9f0fa24e
Fix GCE provider: #create returns bootstrap result
...
fixes #43997
2017-10-10 13:13:49 -03:00
Erik Johnson
92e05cf1c0
Don't allow path separators in minion ID
2017-10-10 11:03:29 -04:00
Erik Johnson
70133aa305
Do not allow IDs with null bytes in decoded payloads
2017-10-10 11:03:29 -04:00
Erik Johnson
c0149101c0
Do not allow IDs with null bytes in decoded payloads
2017-10-10 10:58:42 -04:00
Erik Johnson
19481423dd
Don't allow path separators in minion ID
2017-10-10 10:58:42 -04:00
Ch3LL
9a00302cd8
fix 2016.3.7 release notes merge conflict
2017-10-10 10:55:18 -04:00
Erik Johnson
63da1214db
Do not allow IDs with null bytes in decoded payloads
2017-10-10 10:54:13 -04:00
Erik Johnson
ee792581fc
Don't allow path separators in minion ID
2017-10-10 10:54:13 -04:00
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
