Nicole Thomas
|
d89c317d96
|
Merge pull request #44021 from whiteinge/cpstats-attribute-error
Also catch cpstats AttributeError for bad CherryPy release ~5.6.0
|
2017-10-12 14:11:40 -04:00 |
|
Seth House
|
bf14e5f578
|
Also catch cpstats AttributeError for bad CherryPy release ~5.6.0
|
2017-10-12 09:50:22 -06:00 |
|
Nicole Thomas
|
e38f313ac0
|
Merge pull request #44051 from twangboy/win_fix_docs_dacl
Fix some documentation formatting issues in the win_dacl state
|
2017-10-12 11:40:16 -04:00 |
|
Nicole Thomas
|
2fedcec6bb
|
Merge branch '2017.7' into jid_queue
|
2017-10-12 11:29:56 -04:00 |
|
Nicole Thomas
|
a85837d72b
|
Merge pull request #44066 from Ch3LL/cherry_release
Add Known CherryPy Issue to 2017.7.2 Release Notes
|
2017-10-12 11:18:24 -04:00 |
|
Ch3LL
|
8e597fcce9
|
Add Known CherryPy Issue to 2017.7.2 Release Notes
|
2017-10-12 09:33:59 -04:00 |
|
Nasenbaer
|
255aa94c64
|
Activate jid_queue also for SingleMinions to workaround 0mq reconnection issues
|
2017-10-12 10:02:54 +02:00 |
|
Nasenbaer
|
9efd63526a
|
Adapted documentation of delete_on_termination parameter
|
2017-10-12 09:54:42 +02:00 |
|
Nasenbaer
|
eb2bfd047b
|
Add missing delete_on_termination passthrough. Adapt docs.
|
2017-10-12 09:54:42 +02:00 |
|
Mike Place
|
fcab77ac7b
|
Merge pull request #43889 from CorvinM/issue43449
Fix issue with using roster_defaults with flat or cloud rosters.
|
2017-10-11 17:22:10 -06:00 |
|
twangboy
|
377d6b6171
|
Fix some docs in the win_dacl state module
|
2017-10-11 16:28:26 -06:00 |
|
Mike Place
|
3ad1c6d1d9
|
Merge pull request #44031 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
|
2017-10-11 16:03:30 -06:00 |
|
Mike Place
|
5db1e8c6ca
|
Merge pull request #44045 from isbm/isbm-tgttype-fix-2017-port
Bugfix: always return a string "list" on unknown job target type.
|
2017-10-11 15:58:11 -06:00 |
|
Nicole Thomas
|
bbdabe242a
|
Merge pull request #44025 from dayid/lover_typo
Typo correction of lover to lower
|
2017-10-11 13:31:44 -04:00 |
|
Bo Maryniuk
|
471ff35c2f
|
Bugfix: always return a string "list" on unknown job target type.
|
2017-10-11 17:45:00 +02:00 |
|
garethgreenaway
|
6c8f7fd5ec
|
Merge pull request #44026 from rallytime/bp-43950
Back-port #43950 to 2017.7
|
2017-10-11 08:27:48 -07:00 |
|
Nicole Thomas
|
5d719a2219
|
Merge pull request #44027 from rallytime/bp-44012
Back-port #44012 to 2017.7.2
|
2017-10-11 09:28:24 -04:00 |
|
Nicole Thomas
|
57623e2abe
|
Merge pull request #44028 from rallytime/bp-44011
Back-port #44011 to 2016.11.8
|
2017-10-11 09:27:58 -04:00 |
|
rallytime
|
1d4a6c3949
|
Lint: Fixup undefined variable errors
|
2017-10-11 09:25:41 -04:00 |
|
Nicole Thomas
|
d8f3891a5e
|
Merge pull request #44030 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
|
2017-10-11 09:01:41 -04:00 |
|
Matthew Summers
|
18fb0be96a
|
addresses issue #43307, disk.format_ to disk.format
This change fixes breakage. It appears the disk.format_ func is
aliased to disk.format in modules/disk.py
|
2017-10-10 16:11:54 -05:00 |
|
rallytime
|
788ad0609a
|
Merge branch '2016.11' into '2017.7'
No conflicts.
|
2017-10-10 16:34:52 -04:00 |
|
rallytime
|
53eaf0d75c
|
Merge branch '2016.3' into '2016.11'
No conflicts.
|
2017-10-10 16:20:33 -04:00 |
|
Erik Johnson
|
89e084bda3
|
Do not allow IDs with null bytes in decoded payloads
|
2017-10-10 16:13:47 -04:00 |
|
Erik Johnson
|
206ae23f15
|
Don't allow path separators in minion ID
|
2017-10-10 16:13:46 -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
|
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
|
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 |
|