Commit Graph

100484 Commits

Author SHA1 Message Date
Daniel Wozniak
c4bbe1ac81
Merge pull request #51177 from nullify005/51069-ri-and-rdoc-removed
51069: ri and rdoc options removed from gem (rubygems >3)
2019-02-13 15:04:37 -07:00
Daniel Wozniak
c0aa4dc837
Fix linter by ignoring async await check. 2019-02-13 14:51:08 -07:00
lomeroe
5ed8eb648e Properly create the value for a "True" boolean element item
Closes #51634
2019-02-13 15:24:45 -06:00
Megan Wilhite
0ca04ffbeb
Merge pull request #51627 from twangboy/fix_lgpo_2019.2.0
Use makedirs instead of mkdir
2019-02-13 14:44:47 -05:00
Daniel Wozniak
41a581c489
Merge pull request #51624 from dwoz/wait_minions_rc1
[2019.2.0.rc1] Wait for minions to be pingable before starting tests
2019-02-13 12:43:59 -07:00
twangboy
30c18324a4
Use tempfile to get temp dir 2019-02-13 12:40:19 -07:00
Gareth J. Greenaway
396622c2b0
Merge branch '2017.7' into lint-2017 2019-02-13 11:38:35 -08:00
twangboy
e3d3c5a8e2
Add tests for issue 51309 2019-02-13 12:22:36 -07:00
Gareth J. Greenaway
28fc070e42
Merge branch '2018.3' into 51266_schedule_enable_disable_break_save 2019-02-13 10:42:27 -08:00
Gareth J. Greenaway
09fb3e7fc5
Merge branch '2019.2' into merge-2018.3 2019-02-13 10:32:21 -08:00
twangboy
5a90b30589
Use makedirs instead of mkdir 2019-02-13 11:25:29 -07:00
twangboy
b2c9c3b758
Use makedirs instead of mkdir 2019-02-13 11:21:19 -07:00
Daniel Wozniak
e7ee04e6d5
Merge pull request #51549 from s0undt3ch/2019.2
[2019.2] Allow NOT to install pip dependencies
2019-02-13 11:16:51 -07:00
Daniel Wozniak
f1e29c82a8
Merge pull request #51548 from s0undt3ch/2018.3
[2018.3] Allow NOT to install pip dependencies
2019-02-13 11:16:05 -07:00
Daniel Wozniak
611065e72d
Merge branch '2018.3' into 2018.3 2019-02-13 11:15:37 -07:00
Daniel Wozniak
ba8d0eaa9a
Merge pull request #51547 from s0undt3ch/2017.7
[2017.7] Allow NOT to install pip dependencies
2019-02-13 11:14:36 -07:00
Daniel A. Wozniak
22d31539c4
fix linter 2019-02-13 11:06:42 -07:00
Daniel A. Wozniak
9a4ea8f8ab
Wait for minions to be pingable before starting tests 2019-02-13 11:06:20 -07:00
Shane Lee
84f5d639ae
Merge branch '2018.3' into fix_51566 2019-02-13 10:38:13 -07:00
Daniel Wozniak
c96464be56
Merge pull request #51595 from mirceaulinic/mircea/port-824e0e5
Fix ipaddress imports
2019-02-13 10:33:08 -07:00
Gareth J. Greenaway
00a6246050
Merge pull request #51622 from brejoc/2018.3-empty-job-workaround
Prevents crash when there is no job entry
2019-02-13 09:32:46 -08: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
Gareth J. Greenaway
1c6d4fbc74
When looping through the schedule to remove hidden attributes, we should only do that if the item in question is a dictionary. It could be the attribute that determines if the entire scheudle is enabled or disable. 2019-02-13 09:27:55 -08:00
Megan Wilhite
6a406b7f97
Merge pull request #51614 from twangboy/fix_51566_2019.2.0
Handle explicit lists properly
2019-02-13 12:09:33 -05:00
Shane Lee
30ce5094ab
Merge pull request #51182 from lmf-mx/darwin-plist-update
Fix service name in minion plist
2019-02-13 09:42:40 -07:00
Jochen Breuer
d263410e46
Prevents crash when there is no job entry
Seems like in rare race conditions it might happen that there is no job
entry. This prevents Salt from crashing at that point.
2019-02-13 16:52:29 +01:00
Daniel Wozniak
95c505a1fa
Merge branch '2019.2' into merge-2018.3 2019-02-13 06:28:11 -07:00
Pedro Algarvio
d2125aa38b
Allow NOT to install pip dependencies 2019-02-13 12:09:14 +00:00
Pedro Algarvio
5342305725
Allow NOT to install pip dependencies 2019-02-13 12:04:56 +00:00
Pedro Algarvio
8e009e0972
Allow NOT to install pip dependencies 2019-02-13 12:02:09 +00:00
Pedro Algarvio
14f49b5f04
Don't prevent get_locale from working when running under docker 2019-02-13 10:17:36 +00:00
Daniel Wozniak
6b1a2016db
Merge branch '2018.3' into 51069-ri-and-rdoc-removed 2019-02-13 01:57:14 -07:00
Daniel Wozniak
4297c0d380
Merge branch '2017.7' into darwin-plist-update 2019-02-13 01:55:34 -07:00
Daniel Wozniak
68ac07f457
Merge pull request #51442 from dwoz/multi_master
Handle multi_master failover when daemonized
2019-02-13 01:26:49 -07:00
Daniel Wozniak
e3c9a3e66c
Merge pull request #51517 from damianosSemmle/fix-string-format-index
Fixed string format index out of range error
2019-02-13 01:18:37 -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
5bb9b323fe
Merge pull request #51393 from garethgreenaway/various_documentation_fixes
[2018.3] Various documentation fixes
2019-02-12 22:34:55 -07:00
Daniel Wozniak
884981f735
Merge pull request #51465 from ezh/50556
fix #50556 state.orchestrate_show_sls
2019-02-12 22:11:48 -07:00
Daniel Wozniak
c0959e2b1c
Merge branch '2019.2' into fix-string-format-index 2019-02-12 21:34:23 -07:00
Daniel Wozniak
e8e91e3b27
Merge branch '2018.3' into solarisips_fixes 2019-02-12 21:22:15 -07:00
Daniel Wozniak
231d6e2d39
Merge pull request #51541 from bdrung/silence-linux_distribution-deprecation-warning
Silence linux_distribution deprecation warning
2019-02-12 21:18:01 -07:00
Daniel Wozniak
f87d5eccea
Merge pull request #51558 from bdrung/test-zypp-plugin
Do not load zyppnotify file on module import
2019-02-12 21:16:34 -07:00
Daniel Wozniak
82500bbc32
Merge pull request #51581 from garethgreenaway/merge-2019.2.0rc1
[2019.2] Merge forward from 2019.2.0rc1 to 2019.2
2019-02-12 21:11:15 -07:00
Daniel Wozniak
c34967dd22
Merge branch '2018.3' into test-zypp-plugin 2019-02-12 18:04:39 -07:00
Daniel Wozniak
c4feea1c7b
Merge branch '2018.3' into silence-linux_distribution-deprecation-warning 2019-02-12 18:00:12 -07:00
Daniel Wozniak
e060b979a4
Merge branch '2018.3' into merge-2017.7 2019-02-12 17:56:53 -07:00