twangboy
|
a4e2d8059d
|
Fix unit.templates.test_jinja for Windows
Fix problem with files that end with new line on Windows
Fix some problems with regex
Fix some unicode conversion issues
|
2017-10-16 10:41:36 -06:00 |
|
Mike Place
|
28fa097b9b
|
Merge pull request #44099 from twangboy/win_skip_test_parsers
Skip Master, Minion, and Syndic parser tests
|
2017-10-16 10:06:59 -06:00 |
|
Nicole Thomas
|
dbf112ead7
|
Merge pull request #44106 from roaldnefs/fix-doc-mattermost_returner
Fix mattermost returner documentation
|
2017-10-16 09:12:23 -04:00 |
|
Roald Nefs
|
b3761a0401
|
Fix doc indentation in mattermost_returner
|
2017-10-14 13:33:04 +02:00 |
|
twangboy
|
caf086c05a
|
Skip Master, Minion, and Syndic parser tests
|
2017-10-13 16:02:01 -06:00 |
|
Nicole Thomas
|
fd2c51b76c
|
Merge pull request #44054 from eyj/boto_lc
Backport of missing delete_on_termination
|
2017-10-13 11:45:24 -04:00 |
|
Nicole Thomas
|
b61ed96268
|
Merge pull request #44076 from Ch3LL/spm_test
Add spm shell tests
|
2017-10-13 10:32:18 -04:00 |
|
nasenbaer13
|
34d4629a64
|
Merge branch '2017.7' into boto_lc
|
2017-10-13 12:48:49 +02:00 |
|
Ch3LL
|
d2e91c33bd
|
Add spm shell tests
|
2017-10-12 15:31:48 -04: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
|
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
|
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 |
|
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 |
|
rallytime
|
1d4a6c3949
|
Lint: Fixup undefined variable errors
|
2017-10-11 09:25:41 -04:00 |
|
rallytime
|
788ad0609a
|
Merge branch '2016.11' into '2017.7'
No conflicts.
|
2017-10-10 16:34:52 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|