Ch3LL
|
e09be8425b
|
Update test_schema to mirror the new ValidationErrors in 3.0.0
|
2019-04-17 15:45:05 -04:00 |
|
Daniel Wozniak
|
21d63656c1
|
Merge pull request #52526 from lomeroe/deserializer_opts_fix
Fix use of deserializer_opts in file.serialize
|
2019-04-17 07:08:51 -07:00 |
|
Daniel Wozniak
|
e522ffe08c
|
Merge pull request #52570 from DSRCorporation/bugs/revert_51963_2019.2
Simplify IPCClient and prevent corrupt messages (Turn 2) 2019.2
|
2019-04-17 07:03:01 -07:00 |
|
Daniel Wozniak
|
b17340615c
|
Merge pull request #52551 from garethgreenaway/52449_test_gce_random_failures
[2019.2] Marking the two tests in test_gce as flaky
|
2019-04-17 07:00:38 -07:00 |
|
Daniel Wozniak
|
83523626af
|
Merge pull request #52553 from mattLLVW/fix_django_auth_docs
fix: #51842
|
2019-04-17 06:59:44 -07:00 |
|
Daniel Wozniak
|
9faa49cca4
|
Merge pull request #52490 from dwoz/issue_52134
Fix pillar include regression
|
2019-04-17 06:54:38 -07:00 |
|
Daniel Wozniak
|
b0c023703a
|
Merge pull request #52552 from twangboy/fix_win_task_2019.2
Bring 52170 into 2019.2
|
2019-04-17 06:54:16 -07:00 |
|
Daniel Wozniak
|
cc0cd5ddde
|
Merge pull request #52528 from Ch3LL/merge-2019.2
[2019.2] Merge forward from 2018.3 to 2019.2
|
2019-04-17 06:53:45 -07:00 |
|
Dmitry Kuzmenko
|
fabbcac8e6
|
A couple of race conditions fixes and a test update.
|
2019-04-17 02:00:22 +03:00 |
|
Dmitry Kuzmenko
|
9c85734a3c
|
Drop singleton from IPCClient
|
2019-04-17 02:00:22 +03:00 |
|
Dmitry Kuzmenko
|
7cf6d549f2
|
Revert "Support parallel work of multiple IPCMEssageSubscribers in one process"
This reverts commit 710ab50624.
|
2019-04-17 02:00:22 +03:00 |
|
Dmitry Kuzmenko
|
7f26e764fc
|
Revert "Update doc conf with the new import tornado.queues"
This reverts commit 684bf584f6.
|
2019-04-17 02:00:22 +03:00 |
|
Dmitry Kuzmenko
|
69e9416612
|
Revert "Minor: Fix typo in docstring"
This reverts commit 37aeba3143.
|
2019-04-17 02:00:21 +03:00 |
|
twangboy
|
fd19cca2f6
|
Remove some warts in the docs
|
2019-04-16 11:10:58 -06:00 |
|
Ch3LL
|
87cf385e64
|
increase timeout on test_state for windows
|
2019-04-16 09:58:47 -04:00 |
|
twangboy
|
deb0b10bb4
|
Fix some lint
|
2019-04-15 16:41:04 -06:00 |
|
twangboy
|
a279d45843
|
Final doc fixes
|
2019-04-15 16:31:20 -06:00 |
|
Ch3LL
|
3442202bb4
|
Increase timeout for test_kwarg tests
|
2019-04-15 17:32:57 -04:00 |
|
twangboy
|
58f0cd2b86
|
Fix docs... attempt 6
|
2019-04-15 15:04:53 -06:00 |
|
twangboy
|
a66716ebc5
|
Fix docs... attempt 5
|
2019-04-15 14:55:12 -06:00 |
|
twangboy
|
f6f33812d2
|
Fix docs... attempt 4
|
2019-04-15 14:31:14 -06:00 |
|
twangboy
|
18cfc15895
|
Fix docs... attempt 3
|
2019-04-15 14:01:43 -06:00 |
|
twangboy
|
c691e0d1af
|
More doc fixes
|
2019-04-15 13:26:31 -06:00 |
|
twangboy
|
e01077bfc2
|
Fix docs issue... maybe...
|
2019-04-15 13:02:55 -06:00 |
|
matt LLVW
|
3baeedfcb2
|
fix: #51842
|
2019-04-15 19:21:37 +02:00 |
|
twangboy
|
b6494950e6
|
Honor 80 character line limit
|
2019-04-15 11:16:50 -06:00 |
|
twangboy
|
eba45074ce
|
Bring 52170 into 2019.2
Mostly documentation fixes
|
2019-04-15 10:42:43 -06:00 |
|
Gareth J. Greenaway
|
28af717078
|
Marking the two tests in test_gce as flaky.
|
2019-04-15 09:22:58 -07:00 |
|
Megan Wilhite
|
2c3ff2fc98
|
Merge branch '2019.2' into merge-2019.2
|
2019-04-15 12:15:54 -04:00 |
|
Ch3LL
|
474efa1ce4
|
Fix pylint and state test failure
|
2019-04-15 12:14:55 -04:00 |
|
lomeroe
|
ea0520c8e3
|
update test for serialization opts
|
2019-04-14 10:49:50 -05:00 |
|
Daniel Wozniak
|
e91240b439
|
Merge pull request #52534 from twangboy/tls_support_2019.2
Add TLS support up to TLS 1.2
|
2019-04-13 15:56:40 -07:00 |
|
Megan Wilhite
|
048a82e3d7
|
Merge branch '2019.2' into merge-2019.2
|
2019-04-12 21:41:13 -04:00 |
|
Ch3LL
|
795a7f67da
|
Fix windows tests - increase timeout
|
2019-04-12 21:32:33 -04:00 |
|
Ch3LL
|
c70772c5a0
|
Fix linux state tests- add new comment
|
2019-04-12 19:50:52 -04:00 |
|
Daniel Wozniak
|
2c42e4dd80
|
Merge pull request #52536 from twangboy/fix_choco_2019.2
Bring #52191 into 2019.2 branch
|
2019-04-12 14:31:22 -07:00 |
|
twangboy
|
b394ad566d
|
Bring #52191 into 2019.2 branch
|
2019-04-12 14:47:22 -06:00 |
|
twangboy
|
9ec54c47c7
|
Add TLS support up to TLS 1.2
|
2019-04-12 13:44:49 -06:00 |
|
Ch3LL
|
294156743a
|
Merge branch '2018.3' into '2019.2'
Conflicts:
- tests/unit/transport/test_ipc.py
|
2019-04-12 12:31:57 -04:00 |
|
Thomas S Hatch
|
262516c63a
|
Merge pull request #52209 from twangboy/fix_choco_retcode
Handle Chocolatey's new Enhanced Exit Codes
|
2019-04-12 10:01:28 -06:00 |
|
Thomas S Hatch
|
dd7a4baa4f
|
Merge pull request #52046 from twangboy/use_reg_timezone
Use registry to get timezone
|
2019-04-12 09:58:55 -06:00 |
|
Thomas S Hatch
|
0d096086dd
|
Merge pull request #52396 from dmurphy18/fix_aix_ssh
Altered code to support salt-ssh on AIX
|
2019-04-12 09:57:07 -06:00 |
|
lomeroe
|
84ff03ad6e
|
Correct attempting to use the serializer_name to pull deserializer_opts
when deserializer_name is used as the key in the deserializer_options
dict.
|
2019-04-12 10:55:11 -05:00 |
|
Daniel A. Wozniak
|
876dd18e9b
|
Fix merge wart
|
2019-04-12 03:58:00 +00:00 |
|
Daniel A. Wozniak
|
2ed650b91f
|
Merge remote-tracking branch 'saltstack/2019.2' into issue_52134
|
2019-04-12 03:52:06 +00:00 |
|
Daniel Wozniak
|
6eb2bce9be
|
Merge pull request #52334 from waynew/51879-fix-binary-pillar-return-error
51879 fix binary pillar return error
|
2019-04-11 20:45:16 -07:00 |
|
Daniel Wozniak
|
2d59705a29
|
Merge pull request #52043 from arsiesys/fix_influxdb_state_rp
fix missing client_args in influxdb module
|
2019-04-11 20:43:02 -07:00 |
|
Daniel Wozniak
|
1b969c39cf
|
Merge pull request #52146 from twangboy/fix_test_symlink_2019.2
Add missing symlink test
|
2019-04-11 17:51:15 -07:00 |
|
Daniel Wozniak
|
7a1b8cad9e
|
Merge pull request #52341 from cbosdo/virt-state-fixes
virt.pool_running: fix pool start
|
2019-04-11 17:14:51 -07:00 |
|
Daniel Wozniak
|
576478e6e0
|
Merge pull request #52473 from Ch3LL/bp-49437
Backport #49437 into 2018.3
|
2019-04-11 17:10:24 -07:00 |
|