rallytime
|
53eaf0d75c
|
Merge branch '2016.3' into '2016.11'
No conflicts.
|
2017-10-10 16:20:33 -04:00 |
|
Erik Johnson
|
f7824e41f3
|
Don't allow path separators in minion ID
|
2017-10-10 16:12:14 -04:00 |
|
Erik Johnson
|
44060dc9c1
|
Do not allow IDs with null bytes in decoded payloads
|
2017-10-10 16:12:13 -04:00 |
|
Arthur Lutz
|
a37e0bad62
|
[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-10 16:09:52 -04:00 |
|
David A. Pocock
|
385980c21a
|
Merge branch '2016.11' of https://github.com/saltstack/salt into lover_typo
|
2017-10-10 15:06:18 -05:00 |
|
Nicole Thomas
|
bd6b4dc10b
|
Merge pull request #44006 from rallytime/follow-up-43946
Include versionadded tags for new key_text kwarg
|
2017-10-10 16:06:06 -04:00 |
|
Nicole Thomas
|
64fd839377
|
Merge pull request #44010 from Ch3LL/2016.3.7_follow_up
Security Fixes for 2016.3.8
|
2017-10-10 16:05:00 -04:00 |
|
Nicole Thomas
|
0dbf41e79e
|
Merge pull request #44011 from Ch3LL/2016.11.7_follow_up
Security Fixes for 2016.11.8
|
2017-10-10 16:04:35 -04:00 |
|
Nicole Thomas
|
369ee8a132
|
Merge pull request #44012 from Ch3LL/2017.7.1_follow_up
Security Fixes for 2017.7.2
|
2017-10-10 16:04:07 -04:00 |
|
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
|
5406843d3f
|
Merge pull request #44018 from benediktwerner/develop
Fixed digitalocean cloud module doc file not being renamed by #43588
|
2017-10-10 15:57:55 -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
|
5812334419
|
Merge pull request #43993 from benediktwerner/fix-sensehat-docs
Improved sensehat execution module documentation
|
2017-10-10 15:14:23 -04:00 |
|
Gareth J. Greenaway
|
349782635d
|
This should be mount_opts and I typoed it as opts. Fixing that.
|
2017-10-10 11:38:41 -07:00 |
|
Benedikt Werner
|
ac363eaae7
|
Fixec back-ticks in sensehat module
|
2017-10-10 20:32:29 +02: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 |
|
garethgreenaway
|
cdc6f947f1
|
Merge branch 'develop' into fix-sensehat-docs
|
2017-10-10 10:26:27 -07: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 |
|
Benedikt Werner
|
c5dde87d88
|
Renamed digitalocean cloud module doc file
|
2017-10-10 18:55:06 +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 |
|
garethgreenaway
|
4064bf4768
|
Merge branch 'develop' into vagrant-module
|
2017-10-10 08:27:16 -07: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 |
|
rallytime
|
293a369a95
|
Include versionadded tags for new key_text kwarg
Refs #43946 and #40040
|
2017-10-10 09:10:02 -04:00 |
|
Nicole Thomas
|
0cf0d78957
|
Merge pull request #43946 from jerrykan/apt_key_text_check
Document key_text option in pkgrepo state and add some checks
|
2017-10-10 09:06:16 -04: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 |
|
Nicole Thomas
|
33e0353858
|
Merge branch 'develop' into vmm_grain
|
2017-10-10 09:01:33 -04:00 |
|
Nicole Thomas
|
a928dc9086
|
Merge pull request #43769 from mtorromeo/git-noexec-fix
Copy git ssh-id-wrapper to /tmp only if necessary (Fixes #10582, #19532)
|
2017-10-10 09:00:49 -04:00 |
|
Nicole Thomas
|
99e8c40b92
|
Merge pull request #43887 from techhat/azuredep
Add doc for new requirement (azurearm)
|
2017-10-10 08:51:51 -04:00 |
|
nasenbaer13
|
864c8b210a
|
Merge branch 'develop' into boto_asg
|
2017-10-10 12:26:53 +02:00 |
|
David McKay
|
ef50acf56f
|
Adding requirement for requests 2.4.2 when using Vault module
|
2017-10-10 10:53:23 +01:00 |
|
Vernon Cole
|
7501f5e256
|
Merge remote-tracking branch 'origin/vagrant-module' into vagrant-module
|
2017-10-09 20:46:15 -06:00 |
|
Vernon Cole
|
dfa91e379f
|
fix jenkins Python3 loader error warnings
|
2017-10-09 20:45:32 -06:00 |
|