Daniel A. Wozniak
9805f38e13
Fix wart in IPC merge forward
2019-04-11 02:04:55 +00:00
Gareth J. Greenaway
7c963c16b3
Merge branch '2018.3' into ping_reaction_test
2019-04-10 16:02:07 -07:00
Daniel A. Wozniak
75ddeb3074
fix linter
2019-04-10 22:53:00 +00:00
Daniel A. Wozniak
e3e1d2ed08
fix reactor ping test
2019-04-10 22:52:52 +00:00
Daniel A. Wozniak
b0af11f3d3
Run include tests when pillar source changes
2019-04-10 22:41:47 +00:00
Daniel A. Wozniak
307cec64e1
Fix pillar tests
2019-04-10 21:51:25 +00:00
Daniel A. Wozniak
1a33bde52c
import __future__.absolute_import
2019-04-10 21:20:22 +00:00
Daniel A. Wozniak
5dc5de9dab
Use file encoding and add docstring
2019-04-10 21:03:43 +00:00
Daniel A. Wozniak
e84cd413a9
Fix pillar include wart
2019-04-10 20:56:07 +00:00
Daniel A. Wozniak
c79f496021
Add pillar include tests
2019-04-10 20:55:46 +00:00
Daniel A. Wozniak
7745242f29
Revert "Fix #22063 : pillar wildcard support include"
...
This reverts commit fbab73a35c
2019-04-10 20:51:19 +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
Daniel Wozniak
2df74ca6d6
Merge pull request #52476 from bloomberg/win_cmd_2018
...
2018.3 backport #52472 modules.cmdmod: handle windows environ better
2019-04-10 10:30:19 -07:00
Daniel Wozniak
4dfb2f812c
Merge pull request #52474 from Ch3LL/bp-49984
...
Backport #49984 into 2018.3
2019-04-10 10:27:23 -07:00
Daniel Wozniak
d699485dbc
Merge pull request #52393 from waynew/52087-mine-delete-test-enhancements
...
Use uncommon item in mine delete test
2019-04-10 10:18:14 -07:00
Daniel Wozniak
89bd258ae7
Merge pull request #52445 from dwoz/ipc_fixes_2018.3
...
Simplify IPCClient and prevent corrupt messages
2019-04-10 10:15:38 -07: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
Matt Phillips
0e0c42e204
2018 backport: 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 09:56:35 -04:00
Cristian Hotea
a891fd3a60
Make opkg.del_repo be compatible with pkrepo state module
...
Pkgrepo state module is using a named argument when calling pkg.del_repo.
Change the name of the argument from 'alias' to 'repo' and update all
other functions to be consistent on naming.
Signed-off-by: Cristian Hotea <cristian.hotea@ni.com>
2019-04-10 09:38:29 -04:00
Cristian Hotea
c8d547ed6a
Use prune option in Pygit2 provider when fetching
...
Pygit2 version 0.26.2 added support for pruning when fetching.
In this way Pygit2 provider will no longer need to leverage
git commanand line utility for pruning the remote.
Signed-off-by: Cristian Hotea <cristian.hotea@ni.com>
2019-04-10 09:34:00 -04:00
Cristian Hotea
f66d47451b
Add support to avoid calling refresh_db in opkg.del_repo
...
Since refresh_db is a costly operation we should have the option of not calling that
Signed-off-by: Cristian Hotea <cristian.hotea@ni.com>
2019-04-10 09:29:29 -04:00
Daniel A. Wozniak
1bdaf2931b
Ensure exceptions in service future are handled
2019-04-10 03:32:20 +00: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
Daniel A. Wozniak
c7ad732854
Use six.reraise for py3 compatability
2019-04-09 17:58:13 +00:00
Daniel A. Wozniak
29999b0493
Close message service on subscriber close
2019-04-09 17:49:10 +00: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
Gareth J. Greenaway
dd2306921f
Adding tests for NACL changes.
2019-04-08 14:40:06 -07:00
Shane Lee
4b26dea9b6
Merge branch '2019.2' into unused-salt-crypt
2019-04-08 13:48:24 -06:00
Shane Lee
a429542e91
Merge branch '2019.2' into fix_test_symlink_2019.2
2019-04-08 13:37:18 -06:00
Daniel A. Wozniak
47203f7f79
Fix ipc unit tests
2019-04-08 17:17:20 +00:00
Daniel A. Wozniak
2b35437838
Fix linter issues
2019-04-08 16:55:44 +00:00
Daniel A. Wozniak
503cdd246e
Remove IPCClient singleton
2019-04-08 16:39:59 +00:00
