Daniel A. Wozniak
|
043efa08fa
|
Skip solarisips when not on solaris
|
2019-02-19 16:58:10 -07:00 |
|
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 |
|
Bo Maryniuk
|
2b029752a2
|
Give up on sync for Py3 because of the way tests for py2 are written here
|
2019-02-18 10:58:33 +01:00 |
|
Pedro Algarvio
|
5f9764a93f
|
Merge pull request #51678 from Ch3LL/merge-2019.2.0.rc
[2019.2] Merge forward from 2019.2.0.rc1 to 2019.2
|
2019-02-17 19:02:32 +00:00 |
|
Gareth J. Greenaway
|
f8372ca2bf
|
Merge branch '2019.2' into merge-2019.2.0.rc
|
2019-02-15 16:32:15 -08:00 |
|
Gareth J. Greenaway
|
2036c8aaf8
|
Merge pull request #51679 from Ch3LL/bp-51383
Backport #51383 into 2019.2
|
2019-02-15 16:31:05 -08:00 |
|
Jorge Schrauwen
|
e4971fcabd
|
imgadm module should deal with invalid images better
|
2019-02-15 16:01:21 -05:00 |
|
Ch3LL
|
58f2407331
|
Merge branch '2019.2.0.rc1' into 2019.2
Conflicts:
- tests/integration/__init__.py
|
2019-02-15 15:53:57 -05: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 |
|
Daniel Wozniak
|
1ea6f4b18b
|
Merge pull request #51658 from dwoz/pip_test_fix
[2019.2] Let memcopy make the null bytes, better py3 support
|
2019-02-14 22:42:36 -07:00 |
|
Daniel A. Wozniak
|
c811a70907
|
Let memcopy make the null bytes, better py3 support
|
2019-02-14 19:32:32 -07:00 |
|
Shane Lee
|
a8898f6c9d
|
Merge pull request #51635 from lomeroe/lgpo_boolean_element_fix
Properly create the value for a "True" boolean element item
|
2019-02-14 13:35:56 -07:00 |
|
Shane Lee
|
b97c2b26b7
|
Merge branch '2018.3' into lgpo_boolean_element_fix
|
2019-02-14 13:35:37 -07:00 |
|
Shane Lee
|
5a98fb9751
|
Merge branch '2018.3' into lgpo_boolean_element_fix
|
2019-02-14 13:35:19 -07:00 |
|
Gareth J. Greenaway
|
abd37605cb
|
Merge pull request #51610 from garethgreenaway/51266_schedule_enable_disable_break_save
[2018.3] Fixing schedule when enabled/disabled and saved
|
2019-02-14 12:07:36 -08: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
|
22a04c1287
|
Merge pull request #51650 from dwoz/increase_wait_2019.2
[2019.2] Increase minion wait for slow boxes
|
2019-02-14 09:31:58 -07:00 |
|
Shane Lee
|
ad294f30a2
|
Merge branch '2019.2' into increase_wait_2019.2
|
2019-02-14 09:31:41 -07:00 |
|
Shane Lee
|
6765eeae7b
|
Merge pull request #51649 from dwoz/increase_wait_2018.3
[2018.3] Increase minion wait for slow boxes
|
2019-02-14 09:31:22 -07:00 |
|
Shane Lee
|
9c964efa5a
|
Merge branch '2018.3' into increase_wait_2018.3
|
2019-02-14 09:31:14 -07:00 |
|
Shane Lee
|
a0982f74f4
|
Merge pull request #51645 from dwoz/batch_exit_2019.2
[2019.2] increase batch test timeout on windows
|
2019-02-14 09:29:25 -07:00 |
|
Shane Lee
|
1a882d7fc0
|
Merge branch '2019.2' into batch_exit_2019.2
|
2019-02-14 09:29:12 -07:00 |
|
Shane Lee
|
852a6be3b6
|
Merge pull request #51644 from dwoz/batch_exit_2018.3
[2018.3] increase batch test timeout on windows
|
2019-02-14 09:28:54 -07:00 |
|
Gareth J. Greenaway
|
705a62de7b
|
Merge pull request #51586 from garethgreenaway/merge-2018.3
[2019.2] Merge forward from 2018.3 to 2019.2
|
2019-02-14 08:25:28 -08: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 |
|
Bo Maryniuk
|
2f90054fbe
|
Use temporary filename instead of output directly to the "thin.tgz"
|
2019-02-14 15:50:21 +01:00 |
|
Bo Maryniuk
|
d841164ae3
|
Copy over the result, cleanup afterwards
|
2019-02-14 15:50:21 +01:00 |
|
Bo Maryniuk
|
c6792ee251
|
Add a function that reserves temporary filename for further tarball generation
|
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 |
|
Daniel Wozniak
|
a55e8f6120
|
Merge pull request #51626 from twangboy/fix_lgpo_2018.3
Use makedirs instead of mkdir
|
2019-02-13 19:51:22 -07:00 |
|
Gareth J. Greenaway
|
2be2f4228f
|
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save
|
2019-02-13 18:40:44 -08:00 |
|
Gareth J. Greenaway
|
0f1a4115f6
|
Merge pull request #51187 from menglong81/fix-broken-thing
The network connection is large, causing the to run full when the salt detection is alive
|
2019-02-13 18:39:01 -08:00 |
|
Gareth J. Greenaway
|
deeefc728b
|
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save
|
2019-02-13 18:38:54 -08:00 |
|
Gareth J. Greenaway
|
298ad5c0aa
|
Merge branch '2018.3' into fix-broken-thing
|
2019-02-13 18:36:59 -08:00 |
|
Daniel Wozniak
|
7ed5189a48
|
Merge pull request #51613 from twangboy/fix_51566
Handle explicit lists properly
|
2019-02-13 18:09:04 -07: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 |
|
Daniel Wozniak
|
8b06d06476
|
Merge pull request #51630 from twangboy/add_tests_51534
Add tests for issue 51309
|
2019-02-13 16:43:06 -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 |
|