Bo Maryniuk
98b5629b36
Fix imports
2018-04-30 16:08:53 +02:00
Bo Maryniuk
d94c0f0152
Remove unnecessary variable
2018-04-30 16:06:05 +02:00
Bo Maryniuk
8e377b5653
Lintfix: E0203 and attribute access
2018-04-30 16:06:05 +02:00
Bo Maryniuk
2aab70b1b8
Install ZMQ handler if <15 version
2018-04-30 16:06:05 +02:00
Bo Maryniuk
296c589f4b
Use ZMQ switch utility in the integration tests
2018-04-30 16:06:05 +02:00
Bo Maryniuk
ab5fa34d7c
Use ZMQ_VERSION_INFO constant everywhere
2018-04-30 16:06:05 +02:00
Bo Maryniuk
43b5558b82
Add trace logging on ZMQ sockets communication
2018-04-30 16:06:05 +02:00
Bo Maryniuk
164204a9fe
Remove duplicate code for ZMQ monitor handling
2018-04-30 16:06:05 +02:00
Bo Maryniuk
834b1e4ff0
Remove obsolete ZMQIOLoop direct instance
2018-04-30 16:06:05 +02:00
Bo Maryniuk
1c90cbdb3c
Remove an empty line
2018-04-30 16:04:37 +02:00
Bo Maryniuk
ef2e0acd66
Add logging on ZMQ socket exception
2018-04-30 16:04:37 +02:00
Bo Maryniuk
38ceed371d
Lintfix: ident
2018-04-30 16:04:37 +02:00
Bo Maryniuk
1ece6a5f52
Lintfix: line too long
2018-04-30 16:04:37 +02:00
Bo Maryniuk
4e650c0b44
Remove code duplicate by reusing utilities functions
2018-04-30 16:04:37 +02:00
Bo Maryniuk
57da54b676
Fix imports
2018-04-30 16:01:06 +02:00
Bo Maryniuk
948368e9a1
Add libzmq version info builder
2018-04-30 16:01:06 +02:00
Bo Maryniuk
0b4a17b859
Update log exception message
2018-04-30 16:01:06 +02:00
Bo Maryniuk
116e1809fc
Put a message alongside the exception to the logs
2018-04-30 16:01:06 +02:00
Bo Maryniuk
4bc43124b7
Remove unnecessary ZMQ import and check for its presence
2018-04-30 16:01:06 +02:00
Bo Maryniuk
05f4d40269
Use utility for ZMQ import handling in SSH client
2018-04-30 16:01:06 +02:00
Bo Maryniuk
457ef7d9a5
Use utility for ZMQ import handling in flo/zero
2018-04-30 16:01:06 +02:00
Bo Maryniuk
08dee6f5bd
Use utility for ZMQ import handling
2018-04-30 16:01:06 +02:00
Bo Maryniuk
e2a353cfb0
Remove unnecessary ZMQ extra-check for cache utils
2018-04-30 16:01:06 +02:00
Bo Maryniuk
c8f2cc271d
Remove unnecessary ZMQ extra-check for master utils
2018-04-30 16:01:06 +02:00
Bo Maryniuk
3940667bb9
Remove old ZMQ import handling
2018-04-30 16:01:06 +02:00
Bo Maryniuk
f34a53e029
Use ZMQ utility for version check
2018-04-30 15:59:56 +02:00
Bo Maryniuk
cbb26dcb28
Use ZMQ installer for master
2018-04-30 15:59:56 +02:00
Bo Maryniuk
453e83210a
Add ZMQ version build
2018-04-30 15:58:10 +02:00
Bo Maryniuk
af9601e21d
Use ZMQ importer utility in async
2018-04-30 15:58:10 +02:00
Bo Maryniuk
d50b2b2023
Incorporate tornado-5 fixes
2018-04-30 15:51:17 +02:00
Bo Maryniuk
1fd9af0655
Add ZMQ backward-compatibility tornado installer for older versions
2018-04-30 15:40:59 +02:00
Bo Maryniuk
ad4b40415c
Add one place for handling various ZMQ versions and IOLoop classes
2018-04-30 15:40:59 +02:00
Daniel Wallace
a86e53be66
Merge pull request #47389 from dwoz/moregittestfix
...
Older GitPython versions will not have close
2018-04-29 11:42:05 -05:00
Daniel A. Wozniak
67745c1362
Older GitPython versions will not have close
2018-04-29 00:50:20 -07:00
Daniel Wozniak
a5367eaf63
Merge pull request #47388 from dwoz/test_pip_fix
...
Fix missing import
2018-04-28 11:33:14 -07:00
Daniel A. Wozniak
eb26321e8b
Fix missing import
2018-04-28 10:29:30 -07:00
Daniel Wallace
9b59b991c2
Merge pull request #47380 from gtmanfred/2017.7
...
add io_loop handling to runtests engine
2018-04-28 12:25:28 -05:00
Daniel Wallace
37822c0cbb
Merge pull request #47384 from dwoz/test_pip_fix
...
Fix py2 version of pip test
2018-04-28 10:13:28 -05:00
Daniel Wallace
eefd96732e
Merge pull request #47382 from dwoz/gitfs_tests
...
Close the repo and fix multiple tests
2018-04-28 10:09:16 -05:00
Daniel A. Wozniak
a37a9da1fb
Fix py2 version of pip test
2018-04-28 02:24:39 -07:00
Daniel A. Wozniak
1570708fac
Close the repo and fix multiple tests
2018-04-28 01:32:02 -07:00
Daniel Wallace
93d1445ec1
add io_loop handling to runtests engine
2018-04-27 18:51:51 -05:00
Nicole Thomas
57c75ff660
Merge pull request #47369 from terminalmage/ldap_pillar
...
Return an empty dict if no search_order in ldap ext_pillar config file
2018-04-27 16:58:51 -04:00
Daniel Wallace
bcc66dd9bf
Merge pull request #47363 from DSRCorporation/bugs/replace_exc_info_with_exception
...
Tornado5.0: Future.exc_info is dropped
2018-04-27 13:30:17 -05:00
Erik Johnson
085883ae2d
Return an empty dict if no search_order in ldap ext_pillar config file
...
I forgot to do this in https://github.com/saltstack/salt/pull/47334 , it
is needed to prevent a `KeyError` in these cases.
2018-04-27 13:11:59 -05:00
Nicole Thomas
bcef34f7e1
Merge pull request #47334 from terminalmage/ldap_pillar
...
pillar_ldap: Fix cryptic errors when config file fails to load
2018-04-27 13:53:51 -04:00
Nicole Thomas
31db8ca7ad
Merge pull request #47347 from dwoz/test_mysql_fix_again
...
Proper fix for mysql tests
2018-04-27 13:27:52 -04:00
Nicole Thomas
e573236848
Merge pull request #47359 from gtmanfred/2017.7
...
add mention of the formulas channel to the formulas docs
2018-04-27 12:56:12 -04:00
Daniel A. Wozniak
add78fb618
Fix linter warnings
2018-04-27 09:04:01 -07:00
Erik Johnson
0175a8687c
pillar_ldap: Fix cryptic errors when config file fails to load
...
This fixes an UnboundLocalError when the jinja templating or yaml
loading fails. It also re-adds some previously-deleted crucial
documentation regarding the `search_order` option.
Finally, it fixes some incorrectly-formatted RST and makes the result a
example python data structure.
We still need "split mode" documentation, but this was left undone with
a TODO telling the user to reference a docstring that isn't visible in
the docs.
2018-04-27 10:56:02 -05:00
