Daniel Wozniak
1b969c39cf
Merge pull request #52146 from twangboy/fix_test_symlink_2019.2
...
Add missing symlink test
2019-04-11 17:51:15 -07:00
Daniel Wozniak
7a1b8cad9e
Merge pull request #52341 from cbosdo/virt-state-fixes
...
virt.pool_running: fix pool start
2019-04-11 17:14:51 -07:00
Daniel Wozniak
6040282283
Merge pull request #52427 from garethgreenaway/52350_readd_and_gate_unicode_string_literal_support
...
[2019.2] Support for old yaml render
2019-04-11 17:06:36 -07:00
Daniel Wozniak
05ba7c589f
Merge pull request #52234 from garethgreenaway/51865_match_search_by_master
...
[2019.2] Fixes to matchers when used in pillar
2019-04-11 17:05:47 -07:00
Daniel Wozniak
80d7aea13c
Merge pull request #52160 from cbosdo/virt-whitespace-fix
...
Virt whitespace fix
2019-04-11 17:04:24 -07:00
Daniel Wozniak
b551bbd2e1
Merge pull request #52008 from waynew/51832-re-allow-slash-includes
...
Allow `/` in pillar includes
2019-04-11 17:02:39 -07:00
Daniel Wozniak
d3159cb6b4
Merge pull request #51937 from garethgreenaway/51821_ensure_result_comment_changes_valid_arguments
...
[2019.2] Fix to test state functions to allow arguments that mod_watch uses
2019-04-11 16:57:44 -07:00
Daniel Wozniak
7be04287de
Merge pull request #51913 from garethgreenaway/51818_fix_when_sk_is_empty
...
[2019.2] Fixes to utils/nacl.py
2019-04-11 16:56:56 -07:00
Daniel Wozniak
89f0bd8820
Merge branch '2019.2' into virt-state-fixes
2019-04-11 16:35:25 -07:00
Daniel Wozniak
d6f0971eee
Merge pull request #52399 from waynew/52116-fix-host-present-fail
...
Bring host.present in line with Salt's test conventions
2019-04-11 16:32:27 -07:00
Daniel Wozniak
176024520f
Merge branch '2019.2' into 51865_match_search_by_master
2019-04-11 16:25:00 -07:00
Daniel Wozniak
7c709cfb57
Merge pull request #52477 from bloomberg/win_cmd_2019
...
2019.2 backport #52472 modules.cmdmod: handle windows environ better
2019-04-11 16:13:33 -07:00
Gareth J. Greenaway
82f010ae29
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support
2019-04-11 15:56:35 -07:00
Daniel Wozniak
fd1f539c52
Merge branch '2019.2' into virt-whitespace-fix
2019-04-11 15:53:48 -07:00
Daniel Wozniak
8e1c882715
Merge branch '2019.2' into fix_test_symlink_2019.2
2019-04-11 15:52:39 -07:00
Daniel Wozniak
86c63b5723
Merge branch '2019.2' into 51821_ensure_result_comment_changes_valid_arguments
2019-04-11 15:41:58 -07:00
Daniel Wozniak
55d7488d18
Merge branch '2019.2' into 51818_fix_when_sk_is_empty
2019-04-11 15:41:09 -07:00
Daniel Wozniak
8440ae1b3d
Merge branch '2019.2' into 52116-fix-host-present-fail
2019-04-11 15:38:30 -07:00
Daniel Wozniak
dd002fdad8
Fix linter
2019-04-11 15:38:15 -07:00
Daniel Wozniak
b0d3c76060
Merge pull request #52423 from bbinet/unused-salt-crypt
...
Remove unused salt.crypt import
2019-04-11 14:44:40 -07:00
Daniel Wozniak
4bb918524b
Merge pull request #52506 from bloomberg/2019_zmq_uri
...
2019.2: transport.zmq: fix bug introduced by b7df7e75cf
2019-04-11 14:12:50 -07:00
Daniel Wozniak
1532642e07
Merge pull request #52513 from dwoz/supervisord_2019.2
...
[2019.2] Fix supervisord
2019-04-11 14:09:16 -07:00
Megan Wilhite
ae81fee398
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support
2019-04-11 16:48:05 -04:00
Pedro Algarvio
dc9ace6405
The exit code matters.
...
Prefix any output with ERROR on non 0 exit code because that's what the
supervisord state checks for.
2019-04-11 13:32:43 -07:00
Matt Phillips
1e9dd7fd3f
transport.zmq: fix bug introduced by b7df7e75cf
...
this change was introduced to address evidently another bug where
somehow self.opts has no master_uri - but in the process it prioritized
using master_ip over master_uri even when master_uri _is_ there.
providing master_uri as a way of specifiying which msater you would like
to create a channel for is documented used elsewhere in the codebase in
multi-master scenarios (ie, event.send, saltutil.revoke_auth)
2019-04-11 13:56:13 -04:00
Bruno Binet
dc330e75bd
Merge branch '2019.2' into unused-salt-crypt
2019-04-11 09:12:38 +02:00
Daniel Wozniak
978084dd97
Merge pull request #52496 from dwoz/ipc_wart
...
Fix wart in IPC merge forward
2019-04-10 22:19:01 -07:00
Daniel A. Wozniak
9805f38e13
Fix wart in IPC merge forward
2019-04-11 02:04:55 +00:00
Gareth J. Greenaway
791b64653d
Merge pull request #52482 from dwoz/ipc_fixes_2019.2
...
Ipc fixes 2019.2
2019-04-10 12:53:57 -07:00
Daniel A. Wozniak
f45d29b222
Remove un-needed test
2019-04-10 19:16:14 +00:00
Daniel A. Wozniak
0141b7f744
Fix merge wart
2019-04-10 18:20:31 +00:00
Daniel A. Wozniak
82150f0241
Remove un-used import
2019-04-10 18:01:52 +00:00
Daniel A. Wozniak
c9ec8b1f97
Ensure exceptions in service future are handled
2019-04-10 17:37:36 +00:00
Daniel A. Wozniak
25f5a90bd6
Use six.reraise for py3 compatability
2019-04-10 17:36:47 +00:00
Daniel A. Wozniak
6d80789cf1
Fix ipc unit tests
2019-04-10 17:36:36 +00:00
Daniel A. Wozniak
c80da32234
Fix linter issues
2019-04-10 17:36:28 +00:00
Daniel A. Wozniak
024b4b61eb
Remove IPCClient singleton
2019-04-10 17:36:05 +00:00
Daniel A. Wozniak
f1d0e025ec
Re-raise queued exceptions with traceback
2019-04-10 17:33:24 +00:00
Matt Phillips
736a437520
2019.2 bacpkport: modules.cmdmod: handle windows environ better
...
python exposes an nt.environ for case insensitive environment behavior
that is native to windows; so it makes sense to use this instead of
os.environ to avoid enexpected behavior and failure.
further detail: https://bugs.python.org/issue28824
2019-04-10 10:33:37 -04:00
Wayne Werner
ee3115fa94
Allow leading dots and / as pillar separators
2019-04-09 18:11:44 -05:00
Wayne Werner
29c676d24b
Ensure _closing exists
...
This was raising an ignored exception because _closing was set later in
__init__. Not sure if it must be the last line in __init__.
2019-04-09 18:11:24 -05:00
Wayne Werner
eb517e1a39
Swap '/' for '.' when matching
2019-04-09 18:11:12 -05:00
Gareth J. Greenaway
b2128e8559
Merge branch '2019.2' into 51818_fix_when_sk_is_empty
2019-04-09 12:39:34 -07:00
Gareth J. Greenaway
3173673dcc
Merge pull request #51992 from garethgreenaway/51932_show_diff_when_test_True
...
[2019.2] Swapping pchanges for changes in file state.
2019-04-09 12:38:56 -07:00
Gareth J. Greenaway
d50f011a8e
Merge branch '2019.2' into 51865_match_search_by_master
2019-04-09 11:13:25 -07:00
Gareth J. Greenaway
7c4abd6d6e
changes needs to be a dictionary.
2019-04-09 11:05:34 -07:00
Gareth J. Greenaway
ac950b34c8
Merge branch '2019.2' into 51932_show_diff_when_test_True
2019-04-09 08:32:10 -07:00
Gareth J. Greenaway
b618d44759
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support
2019-04-08 14:55:37 -07:00
Gareth J. Greenaway
cb01a1b6bb
Merge branch '2019.2' into 51818_fix_when_sk_is_empty
2019-04-08 14:41:47 -07:00
Gareth J. Greenaway
1a1e333583
Merge branch '51818_fix_when_sk_is_empty' of github.com:garethgreenaway/salt into 51818_fix_when_sk_is_empty
2019-04-08 14:40:45 -07:00
