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
92,070 Commits 24 Branches 182 Tags 341 MiB
fefc0cc3ca
Commit Graph

92070 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
fefc0cc3ca
Update old utils paths to use new utils paths 2018-04-27 13:44:44 -04:00
rallytime
13e8124031
Merge branch '2017.7' into '2018.3' 
Due to the many merge conflicts created from #47106 against the 2017.7 branch
and #46002 against the 2018.3 branch, the changes from #47106 have been largely
removed from this merge forward and the HEAD of 2018.3 was taken.

A separate fix for Tornado 5.0 support will need to be made directly against the
2018.3 branch.

Conflicts:
  - doc/topics/development/conventions/formulas.rst
  - salt/master.py
  - salt/minion.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/zfs.py
  - salt/transport/ipc.py
  - salt/transport/tcp.py
  - salt/transport/zeromq.py
  - salt/utils/async.py
  - tests/support/helpers.py
  - tests/support/parser/cover.py
  - tests/unit/grains/test_core.py
  - tests/unit/modules/test_ssh.py
  - tests/unit/test_minion.py
  - tests/unit/utils/test_safe_walk.py
 2018-04-27 13:38:35 -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
Mike Place
7390b72808
Merge pull request #47277 from morganwillcock/netbsdswap 
Fix minion crash on NetBSD
 2018-04-27 10:02:20 -05:00
Mike Place
2b7c7ef704
Merge pull request #47320 from twangboy/win_ssm 
Change from NSSM to SSM
 2018-04-27 09:37:49 -05:00
Nicole Thomas
b6df5facce
Merge pull request #47308 from rallytime/bp-47287 
Back-port #47287 to 2018.3
 2018-04-27 09:50:49 -04: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
efa3aab800
Merge pull request #47332 from garethgreenaway/47324_archive_extracted_keep_keep_source 
[2018.3] Removing duplicate code from state/archive.py
 2018-04-27 09:12:50 -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
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
Daniel A. Wozniak
9f7f83a975
Use salt.utils.fopen for line ending consistancy 2018-04-26 12:43:51 -07:00
Daniel A. Wozniak
dcb6a22c00
Remove un-needed string-escape 2018-04-26 11:28:25 -07:00
Nicole Thomas
245d62ca16
Merge pull request #47326 from The-Loeki/redis-cache-sockets 
Some Redis fixes
 2018-04-26 13:12:46 -04:00
Gareth J. Greenaway
cc10bfec6b
Removing redundant code which is prevening keep & keep_source from being set. 2018-04-26 09:55:32 -07:00
Daniel A. Wozniak
cc154ef857
Do not encode usernames 2018-04-26 09:53:56 -07:00
Mike Place
708078b152
Merge pull request #47329 from cachedout/frank_credit 
Credit Frank Spierings
 2018-04-26 11:37:58 -05:00
Mike Place
33c0644ac4
Credit Frank Spierings 2018-04-26 11:29:51 -05:00
Nicole Thomas
a545e55543
Merge pull request #47281 from Ch3LL/system_test 
Add win_system integration module tests
 2018-04-26 12:07:40 -04:00
Nicole Thomas
b64d930df0
Merge pull request #47283 from Ch3LL/ntp_test 
Add windows ntp integration module tests
 2018-04-26 12:04:43 -04:00
Nicole Thomas
910aff910f
Merge pull request #47314 from Ch3LL/net_mac_test 
Skip netstat test on macosx as its not supported
 2018-04-26 12:00:36 -04:00
Nicole Thomas
27a438f0ff
Merge pull request #47319 from dwoz/skip_tests 
Skip unix group tests on windows.
 2018-04-26 11:59:34 -04:00
Nicole Thomas
0549ef7c16
Merge pull request #47307 from rallytime/bp-47257 
Back-port #47257 to 2017.7
 2018-04-26 11:16:22 -04:00
Nicole Thomas
d6ff4689f6
Merge pull request #47312 from rallytime/update-bootstrap-release 
Update bootstrap script to latest release: 2018.04.25
 2018-04-26 11:15:12 -04:00
Ronald van Zantvoort
d86fbe5bdd
redis_return: add unix_socket_path to docs 2018-04-26 16:00:33 +02:00
Ronald van Zantvoort
ee9f533765
redis_cache: document UNIX socket access 2018-04-26 15:57:20 +02:00
Ronald van Zantvoort
5337558a5a
redis_return: Let redis handle pool creation, add UNIX socket support 2018-04-26 15:49:59 +02:00
Ronald van Zantvoort
c90f83b0f9
redis_return: cluster_mode default to False in __virtual__ to prevent KeyError stacktraces 2018-04-26 15:49:59 +02:00
Ronald van Zantvoort
71e3286829
redis_return: Fix code blocks in docs 2018-04-26 15:49:59 +02:00
Ronald van Zantvoort
e6605f1c78
redis_cache fix code blox in docs 2018-04-26 15:49:59 +02:00
Ronald van Zantvoort
40e67747ee
redis_cache: add socket to options 2018-04-26 15:49:58 +02:00
twangboy
5549d83aae
Use ssm instead of nssm 2018-04-25 23:14:28 +00:00
Daniel A. Wozniak
d9442d043e
Skip tests not applicable to windows 2018-04-25 15:26:13 -07:00
Daniel A. Wozniak
d4ae787595
Do not join a thread that is stopped 
Remove the need for exception handling by not raising exceptions in the
first place.
 2018-04-25 14:26:25 -07:00
Mike Place
e0765f5719
Merge pull request #47279 from dwoz/py3_build_fix 
Gracefully shutdown worker threads
 2018-04-25 16:15:42 -05:00
Ch3LL
67beb1451c
Skip netstat test on macosx as its not supported 2018-04-25 16:44:28 -04:00
Daniel Wozniak
057f668788
Merge pull request #47293 from dwoz/win_build_fix 
The grp module is not available on windows
 2018-04-25 13:22:33 -07:00
rallytime
765cce06a2
Update bootstrap script to latest release: 2018.04.25 2018-04-25 15:44:50 -04:00