valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
101,084 Commits 24 Branches 182 Tags 341 MiB
e09be8425b
Commit Graph

15761 Commits

Author SHA1 Message Date
Ch3LL
e09be8425b
Update test_schema to mirror the new ValidationErrors in 3.0.0 2019-04-17 15:45:05 -04:00
Daniel Wozniak
21d63656c1
Merge pull request #52526 from lomeroe/deserializer_opts_fix 
Fix use of deserializer_opts in file.serialize
 2019-04-17 07:08:51 -07:00
Daniel Wozniak
e522ffe08c
Merge pull request #52570 from DSRCorporation/bugs/revert_51963_2019.2 
Simplify IPCClient and prevent corrupt messages (Turn 2) 2019.2
 2019-04-17 07:03:01 -07:00
Daniel Wozniak
b17340615c
Merge pull request #52551 from garethgreenaway/52449_test_gce_random_failures 
[2019.2] Marking the two tests in test_gce as flaky
 2019-04-17 07:00:38 -07:00
Daniel Wozniak
9faa49cca4
Merge pull request #52490 from dwoz/issue_52134 
Fix pillar include regression
 2019-04-17 06:54:38 -07:00
Dmitry Kuzmenko
fabbcac8e6
A couple of race conditions fixes and a test update. 2019-04-17 02:00:22 +03:00
Ch3LL
87cf385e64
increase timeout on test_state for windows 2019-04-16 09:58:47 -04:00
Ch3LL
3442202bb4
Increase timeout for test_kwarg tests 2019-04-15 17:32:57 -04:00
Gareth J. Greenaway
28af717078
Marking the two tests in test_gce as flaky. 2019-04-15 09:22:58 -07:00
lomeroe
ea0520c8e3 update test for serialization opts 2019-04-14 10:49:50 -05:00
Ch3LL
795a7f67da
Fix windows tests - increase timeout 2019-04-12 21:32:33 -04:00
Ch3LL
c70772c5a0
Fix linux state tests- add new comment 2019-04-12 19:50:52 -04:00
Ch3LL
294156743a
Merge branch '2018.3' into '2019.2' 
Conflicts:
  - tests/unit/transport/test_ipc.py
 2019-04-12 12:31:57 -04:00
Thomas S Hatch
dd7a4baa4f
Merge pull request #52046 from twangboy/use_reg_timezone 
Use registry to get timezone
 2019-04-12 09:58:55 -06:00
Daniel A. Wozniak
2ed650b91f
Merge remote-tracking branch 'saltstack/2019.2' into issue_52134 2019-04-12 03:52:06 +00:00
Daniel Wozniak
6eb2bce9be
Merge pull request #52334 from waynew/51879-fix-binary-pillar-return-error 
51879 fix binary pillar return error
 2019-04-11 20:45:16 -07:00
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
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
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
ead856ee93
Merge branch '2019.2' into 51879-fix-binary-pillar-return-error 2019-04-11 16:33:20 -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
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
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
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
Megan Wilhite
ae81fee398
Merge branch '2019.2' into 52350_readd_and_gate_unicode_string_literal_support 2019-04-11 16:48:05 -04:00
Matt Phillips
b682ec5a19 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:58:19 -04: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
Shane Lee
fc8e970221
Merge branch '2018.3' into use_reg_timezone 2019-04-11 10:53:08 -06: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
c79f496021
Add pillar include tests 2019-04-10 20:55:46 +00:00
Daniel A. Wozniak
f45d29b222
Remove un-needed test 2019-04-10 19:16:14 +00:00
Daniel A. Wozniak
6d80789cf1
Fix ipc unit tests 2019-04-10 17:36:36 +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
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
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
Wayne Werner
ee3115fa94
Allow leading dots and / as pillar separators 2019-04-09 18:11:44 -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