saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
106118 commits 34 branches 292 tags 803 MiB
Commit graph

106118 commits

This branch
This branch
All branches
Author SHA1 Message Date
ch3ll
bcc520ccc4
Add saltversioninfo grains test 2020-02-06 16:56:21 -05:00
ch3ll
510e149b87
Fix saltversioninfo grain for new version 2020-02-06 15:55:02 -05:00
twangboy
f00a504a48
Add back the pylauncher 2020-02-05 10:45:28 -07:00
twangboy
30b9c32356
Revert changes to req and req_win 2020-02-05 10:44:18 -07:00
twangboy
98dc0e970c
Fix some warts in the build_env scripts 2020-02-05 10:44:18 -07:00
twangboy
8404141f65
Update dependencies 2020-02-05 10:44:15 -07:00
cmcmarrow
82b39d26f8
Merge branch 'binary_fix_pip_bin_env' of https://github.com/cmcmarrow/salt into binary_fix_pip_bin_env 2020-02-03 13:20:07 -08:00
cmcmarrow
10ca0fa5d6
fix space 2020-02-03 13:18:57 -08:00
Charles McMarrow
a5fa22528a
Merge branch 'master' into binary_fix_pip_bin_env 2020-02-03 12:59:04 -08:00
cmcmarrow
22fff6c180
fix _pip_bin_env 2020-02-03 12:56:57 -08:00
Daniel Wozniak
81eb152643
Merge pull request #56047 from s0undt3ch/hotfix/setuptools 
Move the `salt-unity` implementation to `salt.scripts`
 2020-02-01 15:50:26 -07:00
Pedro Algarvio
f08253bd7e
Move the salt-unity implementation to salt.scripts 2020-02-01 16:51:58 +00:00
Daniel Wozniak
8288117a78
Merge pull request #56039 from s0undt3ch/hotfix/setuptools 
Replace pycryptodome with pycrypto
 2020-01-31 17:43:06 -07:00
Shane Lee
d5425e6630
Merge branch 'master' into binary_fix_pip_bin_env 2020-01-31 16:16:34 -07:00
cmcmarrow
ceda3fde00
add full support for when missing kwargs or args 2020-01-31 15:04:53 -08:00
Pedro Algarvio
ac90bb4d9f
Allow pycrypto to be included in parsed requirements 2020-01-31 21:11:38 +00:00
Pedro Algarvio
69a3d33f09
Replace pycryptodome with pycrypto 
Due to issues found during package testing for the several supported
linux distributions, we're switching back our crypto depencency to
pycrypto.

Security concerned users are still advised to install the latest m2crypto
or pycryptodome library after pip installing salt since salt is prepared
to work with whatever is available.
 2020-01-31 17:56:58 +00:00
Daniel Wozniak
12713dcbfc
Merge pull request #56036 from dwoz/dispreq 
singledispatch only needed for < 3.4
 2020-01-31 10:53:10 -07:00
Daniel A. Wozniak
103890c4fe
backports-abc only for py2 2020-01-31 10:41:16 -07:00
Daniel A. Wozniak
0e4ad85f70
singledispatch only needed for < 3.4 2020-01-31 16:35:14 +00:00
Daniel Wozniak
3136aa2901
Merge pull request #56029 from s0undt3ch/hotfix/setuptools 
Include `requirements/crypto.txt` if transport is `zeromq`
 2020-01-30 12:11:09 -07:00
Daniel Wozniak
b7521d4791
Merge pull request #56032 from dwoz/fix_da_forking_problem 
Fix issues with setuptools in conjunction with spawn
 2020-01-30 12:10:05 -07:00
Daniel A. Wozniak
2a55129f55
Fix issues with setuptools in conjunction when spawn 2020-01-30 11:37:34 -07:00
Pedro Algarvio
f55dbb06b3
Include requirements/crypto.txt if transport is zeromq 2020-01-30 13:23:16 +00:00
cmcmarrow
cf4ab215b5
add fix for bin_env 2020-01-29 17:01:49 -07:00
Charles McMarrow
4b80301338
Merge branch 'master' into win_task_repeat 2020-01-29 14:59:05 -08:00
Daniel Wozniak
b3bf6c250d
Merge pull request #55990 from spenceation/acl-typos 
Fixed incorrect pluralization in linux_acl state
 2020-01-29 15:05:35 -07:00
Daniel Wozniak
0f12432cbc
Merge pull request #56019 from dmurphy18/fix_tornado_async37 
Fix Tornado 4.5.3 embedded for Python 3.7 support
 2020-01-29 14:53:25 -07:00
Daniel Wozniak
f7d25ecda6
Merge pull request #56005 from dwoz/vendimp 
Always import vendored tornado
 2020-01-29 14:30:04 -07:00
David Murphy
db0d9d5546
Fix Tornado 4.5.3 embedded for Python 3.7 support 2020-01-29 11:05:18 -07:00
Daniel Wozniak
78866c6431
Merge pull request #56017 from s0undt3ch/hotfix/setuptools 
Update to the latest salt-bootstrap release, v2020.01.29
 2020-01-29 10:33:26 -07:00
Charles McMarrow
9df94569c4
Merge branch 'master' into win_task_repeat 2020-01-29 09:29:25 -08:00
Pedro Algarvio
49e72ce1e3
Update to the latest salt-bootstrap release, v2020.01.29 2020-01-29 17:24:16 +00:00
Daniel A. Wozniak
82b939acdb
Fix warts on linux py3 2020-01-29 16:19:31 +00:00
Daniel A. Wozniak
1eb3c6ed00
Fix test under 2020-01-29 10:07:48 +00:00
Daniel A. Wozniak
ae9f33f70f
Fix import unit test on windows 2020-01-29 00:05:25 +00:00
Daniel Wozniak
3d90ec3d1a
Merge pull request #56010 from bryceml/fix_code_block_sections 
fix syntax errors on code-block sections in docs
 2020-01-28 14:40:46 -07:00
Daniel Wozniak
77e1c0558a
Merge pull request #56008 from Ch3LL/msgpack_rc 
Add msgpack incompatible warning to 3000 release notes
 2020-01-28 14:40:22 -07:00
Daniel Wozniak
12f8a7174a
Merge pull request #56009 from dwoz/msgpackver 
Do not allow msgpack 1.0.0rc1
 2020-01-28 14:39:59 -07:00
Bryce Larson
2299884a9f
fix syntax errors on code-block sections in docs 2020-01-28 13:15:26 -07:00
ch3ll
d6553aaa8a
msgpack warning <1 not <= 2020-01-28 13:49:30 -05:00
Daniel A. Wozniak
e1bc9e18dd
Clean up un-used imports 2020-01-28 18:20:01 +00:00
Daniel A. Wozniak
e4ee32f2a0
Do not allow msgpack 1.0.0rc1 2020-01-28 18:12:55 +00:00
Daniel A. Wozniak
1d43bbff1a
Make importer py3 compatible 2020-01-28 18:07:46 +00:00
ch3ll
18abc9f80e
Add msgpack incompatible warning to 3000 release notes 2020-01-28 12:45:18 -05:00
Daniel A. Wozniak
93cdbaaa3d
Make linter happy 2020-01-28 16:03:16 +00:00
Daniel A. Wozniak
ac76b03180
Fix bad vendored tornado import 2020-01-28 15:59:47 +00:00
Daniel A. Wozniak
6339a4402f
Always import vendored tornado 2020-01-28 15:43:33 +00:00
Daniel Wozniak
796265c5be
Merge pull request #55998 from dwoz/win_reqs 
Remove redundant reqs from windows
 2020-01-27 20:51:51 -07:00
Daniel A. Wozniak
fc8e978160
Remove redundent reqs from windows 2020-01-28 00:25:56 +00:00