Daniel A. Wozniak
7ed0d7dd51
Fix ruby gems tests, again
2019-02-19 14:22:54 -07:00
Megan Wilhite
b46eac3ec0
Merge branch '2019.2' into merge-2019.2
2019-02-19 11:02:29 -05:00
Ch3LL
6292f861f6
Revert "Remove custom grains module from 2018.3 branch"
...
This reverts commit 191235d8d3
2019-02-19 10:57:44 -05:00
Daniel Wozniak
0bd2d6eadb
Merge pull request #51561 from isbm/isbm-saltssh-thintar-delay-fix
...
SaltSSH: fix delay when creating thin TAR
2019-02-19 03:15:46 -07:00
Ch3LL
92bd6b9dc3
Fix salt.utils.is_windows call
2019-02-15 15:16:38 -05:00
Ch3LL
ffa2f5fa50
Merge branch '2018.3' into '2019.2'
...
Conflicts:
- pkg/windows/build_env_2.ps1
- pkg/windows/build_env_3.ps1
- pkg/windows/req.txt
- pkg/windows/req_win.txt
- salt/grains/core.py
2019-02-15 15:09:36 -05:00
Shane Lee
5a98fb9751
Merge branch '2018.3' into lgpo_boolean_element_fix
2019-02-14 13:35:19 -07:00
Gareth J. Greenaway
fbacb35424
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save
2019-02-14 09:00:50 -08:00
Shane Lee
ad294f30a2
Merge branch '2019.2' into increase_wait_2019.2
2019-02-14 09:31:41 -07:00
Shane Lee
9c964efa5a
Merge branch '2018.3' into increase_wait_2018.3
2019-02-14 09:31:14 -07:00
Shane Lee
1a882d7fc0
Merge branch '2019.2' into batch_exit_2019.2
2019-02-14 09:29:12 -07:00
Gareth J. Greenaway
3d52b26cbd
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save
2019-02-14 07:20:19 -08:00
Bo Maryniuk
f79c81a9e1
Update UT mocking, adjusting for temporary file
2019-02-14 15:50:21 +01:00
Daniel A. Wozniak
a5af9c5388
Increase minion wait for slow boxes
2019-02-14 02:04:35 -07:00
Daniel A. Wozniak
918030e48d
Increase minion wait for slow boxes
2019-02-14 02:00:28 -07:00
Daniel A. Wozniak
4b11d6bb5c
increase batch test timeout on windows
2019-02-14 01:34:01 -07:00
Daniel A. Wozniak
1087d10bea
increase batch test timeout on windows
2019-02-14 01:25:40 -07:00
Daniel Wozniak
dadf414700
Merge pull request #51637 from twangboy/backport_50887_2018.3
...
backport #50887
2019-02-13 20:03:03 -07:00
Gareth J. Greenaway
deeefc728b
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save
2019-02-13 18:38:54 -08:00
twangboy
d8d2b863a5
backport #50887
2019-02-13 17:31:13 -07:00
Shane Lee
1206a94006
Merge branch '2018.3' into fix_51566
2019-02-13 17:00:53 -07:00
twangboy
11681412af
Add test for explicit lists
2019-02-13 16:59:07 -07:00
Shane Lee
ddc017c857
Merge branch '2018.3' into add_tests_51534
2019-02-13 15:33:28 -07:00
twangboy
9e3a01b930
Use existing file instead of tzutil
2019-02-13 15:32:16 -07:00
lomeroe
5ed8eb648e
Properly create the value for a "True" boolean element item
...
Closes #51634
2019-02-13 15:24:45 -06:00
twangboy
30c18324a4
Use tempfile to get temp dir
2019-02-13 12:40:19 -07:00
twangboy
e3d3c5a8e2
Add tests for issue 51309
2019-02-13 12:22:36 -07:00
Gareth J. Greenaway
0760133336
adding integration.scheduler.test_helpers to various files to by pass the test_module_name_source_match check.
2019-02-13 09:27:55 -08:00
Gareth J. Greenaway
1552fba0bc
lint cleanup
2019-02-13 09:27:55 -08:00
Gareth J. Greenaway
086066b75f
Adding a test to ensure _get_schedule which is used by the save functionality works when there is an enabled attribute.
2019-02-13 09:27:55 -08:00
Daniel Wozniak
6b1a2016db
Merge branch '2018.3' into 51069-ri-and-rdoc-removed
2019-02-13 01:57:14 -07:00
Daniel Wozniak
fdb13a3a91
Merge pull request #51523 from lomeroe/solarisips_fixes
...
Bugfixes in solarisips
2019-02-13 01:14:45 -07:00
Daniel Wozniak
4abd9d0462
Merge branch '2019.2' into merge-2018.3
2019-02-13 01:12:52 -07:00
Daniel Wozniak
e3d5fbe947
Merge pull request #51577 from garethgreenaway/merge-2017.7
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-02-13 01:11:10 -07:00
Daniel Wozniak
e8e91e3b27
Merge branch '2018.3' into solarisips_fixes
2019-02-12 21:22:15 -07:00
Daniel Wozniak
c34967dd22
Merge branch '2018.3' into test-zypp-plugin
2019-02-12 18:04:39 -07:00
Daniel Wozniak
e060b979a4
Merge branch '2018.3' into merge-2017.7
2019-02-12 17:56:53 -07:00
Daniel Wozniak
b00e7e8b09
Merge branch '2019.2' into merge-2019.2.0rc1
2019-02-12 17:55:02 -07:00
Daniel A. Wozniak
ab0a6a38e5
fix linter
2019-02-12 12:04:37 -07:00
Daniel A. Wozniak
f2e4a30916
Wait for minions to be pingable before starting tests
2019-02-12 12:04:34 -07:00
Daniel A. Wozniak
d794edb515
fix linter
2019-02-12 12:02:55 -07:00
Daniel A. Wozniak
d6720d2d14
Wait for minions to be pingable before starting tests
2019-02-12 12:02:48 -07:00
Gareth J. Greenaway
25b2ca677f
Merge branch '2018.3' into merge-2017.7
2019-02-12 09:30:04 -08:00
Benjamin Drung
7678c28be7
Do not load zyppnotify file on module import
...
The call imp.load_source() could fail (i.e. when the specified
zyppnotify does not exist). To prevent an import failure in that case,
move the loading of the zyppnotify file into the test case.
Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
2019-02-12 11:25:24 +01:00
Daniel A. Wozniak
cbac390a7d
Use the code directory instead of cwd for python path
2019-02-11 17:13:07 -07:00
Gareth J. Greenaway
6c99cb161f
Merge branch '2018.3' into merge-2018.3
...
Conflicts:
doc/man/salt-api.1
doc/man/salt-call.1
doc/man/salt-cloud.1
doc/man/salt-cp.1
doc/man/salt-key.1
doc/man/salt-master.1
doc/man/salt-minion.1
doc/man/salt-proxy.1
doc/man/salt-run.1
doc/man/salt-ssh.1
doc/man/salt-syndic.1
doc/man/salt-unity.1
doc/man/salt.1
doc/man/salt.7
doc/man/spm.1
pkg/osx/build_env.sh
salt/utils/dns.py
tests/integration/netapi/rest_tornado/test_app.py
tests/support/case.py
tests/unit/utils/test_dns.py
2019-02-11 15:45:43 -08:00
Gareth J. Greenaway
c337fcee4c
Merge branch '2018.3' into merge-2017.7
2019-02-11 14:51:33 -08:00
Daniel A. Wozniak
dbf4356aac
Use the code directory instead of cwd for python path
2019-02-11 14:47:19 -07:00
Daniel A. Wozniak
e49ba862cf
Add testing path to run_script commands
2019-02-11 14:13:25 -07:00
Gareth J. Greenaway
6e55164416
Merge branch '2019.2.0.rc1' into merge-2019.2.0rc1
...
Conflicts:
Gemfile
2019-02-11 11:27:20 -08:00
