Nicole Thomas
63baf4c4f8
Merge pull request #47417 from gtmanfred/slack
...
revert instantiating a Caller Client in the engine
2018-05-01 14:58:06 -04:00
Nicole Thomas
0bdfaa5ffe
Merge pull request #47368 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-05-01 14:56:19 -04:00
Mike Place
4e6870305c
Merge pull request #47403 from rallytime/bp-47356
...
Back-port #47356 to 2018.3
2018-05-01 10:19:05 -05:00
Nicole Thomas
7e0cdd6145
Merge pull request #47407 from terminalmage/update-interval-log
...
Reduce severity of missing X_update_interval key
2018-05-01 11:18:45 -04:00
Nicole Thomas
1377942bcc
Merge pull request #47405 from terminalmage/binary-diff
...
Fix file.get_diff regression in 2018.3 branch
2018-05-01 11:16:45 -04:00
rallytime
46806e595b
Update test assertion comment for pip pkgs
2018-05-01 11:08:09 -04:00
Gareth J. Greenaway
5c8ea7f506
Update slack.py
2018-05-01 07:56:36 -07:00
Daniel Wallace
ee8a5eeb10
revert instantiating a Caller Client in the engine
...
This Caller client prevents running the salt master as a non root user. Also,
master processes are not assigned pillars so it is using whatever minion get
instantiated on the master from a caller client.
Instead, to use pillars, the engine should be started on in a minion process.
2018-05-01 09:51:34 -05:00
Erik Johnson
89ddb08026
Use a lambda instead of defining a one-line function
2018-04-30 14:30:01 -05:00
Nicole Thomas
c267e6083e
Merge pull request #47367 from terminalmage/issue47325
...
Start docker containers with image name instead of ID
2018-04-30 14:46:12 -04:00
Nicole Thomas
3bb00cbb55
Merge pull request #47401 from gtmanfred/proxy
...
fix proxy virtual checks for marathon and fx2
2018-04-30 14:44:45 -04:00
Erik Johnson
abc592bfff
Reduce severity of missing X_update_interval key
...
This should be a warning level, since the master supports syncing
custom fileservers from salt://_fileservers, and custom fileservers are
not likely to have a new config option added for them.
2018-04-30 13:38:58 -05:00
rallytime
d9d24de49e
Lint: Add missing import
2018-04-30 14:10:08 -04:00
Erik Johnson
b79ff04fda
Remove no-longer-used enumerate
2018-04-30 12:11:25 -05:00
Erik Johnson
e03b865359
Add unit test for file.get_diff
2018-04-30 11:45:22 -05:00
Erik Johnson
5bdc9e9bd5
Fix UnboundLocalError in file.get_diff
...
This was only in 2018.3 head and not part of a release
2018-04-30 11:40:41 -05:00
Robin Roth
9b682bc48e
Fix sysctl translate
2018-04-30 11:32:58 -04:00
Daniel Wallace
99f9231759
fix proxy virtual checks for marathon and fx2
2018-04-30 10:05:57 -05:00
Mike Place
c160fe36ce
Merge pull request #47397 from rallytime/2018.3.1-release-notes
...
Add 2018.3.1 Release Notes
2018-04-30 09:44:38 -05:00
rallytime
3b40cdad2a
Add 2018.3.1 Release Notes
2018-04-30 09:35:46 -04:00
Daniel Wallace
3400f829c4
Merge pull request #47374 from DSRCorporation/bugs/tornado50-2018.3
...
tornado50 merge forward for 2018.3
2018-04-29 11:29:11 -05:00
Daniel Wallace
400999c54f
fix pylint
2018-04-28 12:12:06 -05:00
Daniel Wallace
47b6d409d1
add io_loop handling to runtests engine
2018-04-28 11:16:26 -05:00
Daniel Wozniak
2afe4bee95
Merge pull request #47379 from dwoz/m2crypto_regression
...
Properly encode messages when creating/validating signatures with m2crypto
2018-04-28 01:38:22 -07:00
Daniel Wallace
fd074fdb7d
use salt.utils.zeromq
2018-04-27 19:41:00 -05:00
Daniel A. Wozniak
068f2d430d
Always sign and verify bytes
2018-04-27 16:20:18 -07:00
Daniel A. Wozniak
7810ebaba9
Add sign regression tests
2018-04-27 16:14:29 -07:00
Daniel A. Wozniak
f4441c3a1c
Adding regression test for 47124
2018-04-27 16:03:03 -07:00
Pedro Algarvio
4ae33c5d9a
Run off of a temporary config
2018-04-27 23:41:38 +03:00
Pedro Algarvio
7938b4906e
Allow running pytest>=3.5.0
2018-04-27 23:38:08 +03:00
Dmitry Kuzmenko
34058c181e
Tornado 5.0 compatibility fixes
2018-04-27 23:38:06 +03:00
rallytime
c7b73d132e
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-04-27 13:45:13 -04:00
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
Erik Johnson
798134caa3
Add regression test for creating images with image name insead of ID
...
Also changed an existing test to use the new with_tempdir decorator
2018-04-27 12:32:10 -05: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
Erik Johnson
4ed47e839c
Start docker containers with image name instead of ID
2018-04-27 11:52:26 -05:00
Daniel A. Wozniak
add78fb618
Fix linter warnings
2018-04-27 09:04:01 -07: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
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
