valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,810 Commits 24 Branches 182 Tags 341 MiB
05f4d40269
Commit Graph

85810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dmitry Kuzmenko
3f7b93a23c
Tornado5.0: Future.exc_info is dropped 2018-04-27 18:19:36 +03:00
Daniel Wallace
6214ed8133
add mention of the formulas channel to the formulas docs 2018-04-27 08:45:10 -05:00
Nicole Thomas
629503b2a8
Merge pull request #47317 from dwoz/threadshutdown 
Do not join a thread that is stopped
 2018-04-27 09:15:08 -04:00
Nicole Thomas
aacd5cefe3
Merge pull request #47304 from cachedout/test_cli_timeout_arg 
Pass timeout to salt CLI for tests
 2018-04-27 09:11:57 -04:00
Nicole Thomas
55534fb659
Merge pull request #47311 from Ch3LL/firewall_windows 
Add firewall execution modules tests for windows
 2018-04-27 09:10:53 -04:00
Daniel Wallace
1667375a80
Merge pull request #47348 from dwoz/no_symlinks 
Ignore gitfs tests when symlinks not enabled
 2018-04-27 08:08:27 -05:00
Daniel A. Wozniak
2644cc7553
Fix linter nits 2018-04-27 01:22:39 -07:00
Daniel A. Wozniak
799c601184
Proper fix for mysql tests 2018-04-27 00:22:50 -07:00
Daniel A. Wozniak
6db2a0e4d3
Log exceptions at exception level 2018-04-27 00:16:39 -07:00
Daniel A. Wozniak
94a70e847a
Ignore gitfs tests when symlinks not enabled 2018-04-26 23:51:28 -07:00
Daniel Wozniak
dac04261b5
Merge pull request #47342 from dwoz/test_mysql_fix 
Fix mysql test cases
 2018-04-26 17:50:52 -07:00
Daniel Wozniak
34e78ef564
Merge pull request #47341 from dwoz/inet_pton_fix 
Fix python 3 support for inet_pton function
 2018-04-26 16:35:44 -07:00
Daniel A. Wozniak
7496f4c5a8
Fix mysql test cases 2018-04-26 15:42:46 -07:00
Daniel Wozniak
e4779f3246
Merge pull request #47339 from dwoz/ssh_key_test_fix 
Use salt.utils.fopen for line ending consistancy
 2018-04-26 15:39:55 -07:00
Daniel Wozniak
b221860151
Merge pull request #47335 from dwoz/pip_test_fix 
Remove un-needed string-escape
 2018-04-26 14:49:26 -07:00
Daniel A. Wozniak
85451f48d4
Fix python 3 support for inet_pton function 2018-04-26 14:03:54 -07:00
Daniel A. Wozniak
e37a93a1ca
Remove redundent close call 2018-04-26 13:47:11 -07:00
Daniel Wozniak
1c527bfd3a
Merge pull request #47331 from dwoz/py3_wingroup_fix 
Do not encode usernames
 2018-04-26 12:57:27 -07:00
Daniel A. Wozniak
b2ae5889b7
Close the temporary file handle 2018-04-26 12:52:08 -07:00