Daniel Wozniak
3219430dcc
Merge pull request #47456 from dwoz/sysname
...
Sysname returns text type
2018-05-03 19:57:49 -07:00
Nicole Thomas
f3918514a7
Merge pull request #47458 from Ch3LL/unreleased_rn_2018
...
Add In Progress Warning for 2018.3.1 Release Notes
2018-05-03 16:40:46 -04:00
Ch3LL
6a261e5e3a
Add In Progress Warning for 2018.3.1 Release Notes
2018-05-03 12:47:30 -04:00
Daniel A. Wozniak
559ee1961f
Sysname returns text type
2018-05-03 09:16:21 -07:00
Nicole Thomas
9fbdcbe994
Merge pull request #47448 from dwoz/transport_import
...
Fix missing import in test suite
2018-05-03 10:30:23 -04:00
Nicole Thomas
157a32af7f
Merge pull request #47410 from terminalmage/issue47260
...
gitfs: Fix identification of base env when saltenv mapping is disabled
2018-05-03 10:12:26 -04:00
Daniel A. Wozniak
7e04eb82e1
Fix missing import in test suite
2018-05-02 22:56:38 -07:00
Erik Johnson
3ab332ad0e
Update tests to reflect bugfix
2018-05-02 15:21:39 -05:00
Erik Johnson
7b8127f336
gitfs: Fix identification of base env when saltenv mapping is disabled
2018-05-02 15:21:39 -05:00
Mike Place
091e4cf9a6
Merge pull request #47413 from saltstack/repobuild_improv
...
Repobuild improvements for Ubuntu 18.04 lack of gpg2 and better error checking
2018-05-02 11:21:30 -05:00
Nicole Thomas
5e5774fd37
Merge pull request #47216 from twangboy/reg_docs
...
Reg docs
2018-05-02 09:33:27 -04:00
David Murphy
c064032110
Removed extra spaces for pylint
2018-05-01 17:20:29 -06:00
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
David Murphy
20c50b3331
Minor cleanup due to review comments
2018-05-01 11:05:12 -06:00
David Murphy
c143b359e9
Update for Ubuntu 18.04 lack of gpg2 and enhanced error checking
2018-05-01 11:05:12 -06:00
twangboy
0beeb58b16
Fix lint, add bytes
2018-05-01 10:37:02 -06: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
twangboy
bad441f8dc
Fix some lint`
2018-04-30 11:44:05 -06:00
twangboy
af5139c2ff
Add additional examples
2018-04-30 11:44:05 -06:00
twangboy
24df6ec1b7
Additional docs formatting
2018-04-30 11:44:04 -06:00
twangboy
ff46b27a60
Update reg docs, fix formatting issues
2018-04-30 11:44:04 -06: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
