Gareth J. Greenaway
c2ed1d439a
Adding some logging when the cache files are unable to be removed.
2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
44940d6c23
Ensure minion tests using minion options.
2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
722be433c2
Fixing lint
2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
65b44214d4
Adding some master specific functions to uitls/masters.py to determine if a Salt process is running. Updating utils/schedule.py to use the appropriate running function either from utils/master.py or utils/minion.py depending on where the scheduled job is running. Adding tests to test maxrunning in scheduled jobs for both the minion and master.
2018-11-23 17:07:16 -08:00
Gareth J. Greenaway
0d65304350
Swapping manual mocking to autodoc_mock_imports
2018-11-23 17:07:16 -08:00
Claudiu Popescu
47bfba1018
Migrated to cmd.run_all and tested on working srv
2018-11-23 16:11:01 +02:00
Pedro Algarvio
a4771d2612
UNICODE!
2018-11-23 11:47:24 +00:00
Pedro Algarvio
72205a5a38
DO! NOT! SQUASH! TRACEBACKS!
2018-11-23 11:33:44 +00:00
Mike Place
59809a1e1b
Merge pull request #50586 from garethgreenaway/50562_minion_blackout_scheduler
...
[2018.3] minion_blackout for scheduled jobs
2018-11-23 06:15:38 -05:00
Daniel A. Wozniak
a289e3cd55
Merge branch '2017.7' into zmqpubserv
2018-11-22 17:33:02 -07:00
Claudiu Popescu
a1dddce6fd
Fixes icinga2 certs path for newer versions 2.8+
...
Fixes #45867
2018-11-22 16:29:18 +02:00
Damon Atkins
2d1f51ce84
Fix lint only changes, full lint on merge forwards
...
- lint only changes previous diff picked up out of data files, when the branch was out of date.
- full limit on merge forward to pick up changes in the lint checks between versions.
- update CODEOWNERS for .ci/*
2018-11-22 20:15:08 +11:00
Gareth J. Greenaway
48673b7db7
Adding some defaults for minion_blackout code when pillar & grains are not available in opts. Removing some debugging code.
2018-11-21 14:55:26 -08:00
Gareth J. Greenaway
9f422b2a06
Moving the minion_blackout code to the start of the try...except. Adding a test to ensure we get a log.exception when minion_blackout is True.
2018-11-21 14:29:45 -08:00
Gareth J. Greenaway
2bf8fa5362
Adding support for minion_blackout for jobs that are run from the Salt scheduler.
2018-11-21 14:29:45 -08:00
Gareth J. Greenaway
eb510a6675
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host
2018-11-21 08:51:09 -08:00
Proskurin Kirill
cf9ab84a03
Merge branch '2017.7' into fix-supervisord-dead-state-idempotency
2018-11-21 15:53:59 +00:00
Gareth J. Greenaway
6679242480
Merge pull request #50590 from garethgreenaway/bp-50333
...
[2017.7] Back-port PR 50333 to 2017.7
2018-11-21 07:50:40 -08:00
Proskurin Kirill
af386a2d97
Fixed the supervisord.dead state idempotency
...
Fixes #50601
2018-11-21 15:42:58 +00:00
Erik Johnson
5c281797d4
Merge pull request #50576 from garethgreenaway/bp-50549
...
Back-port PR #50549 to 2018.3
2018-11-21 08:39:54 -06:00
Erik Johnson
c9531d8c67
Merge pull request #50599 from terminalmage/merge-2018.3
...
Merge Sphinx fixes from 2017.7 to 2018.3
2018-11-21 07:31:17 -06:00
Erik Johnson
ba82b0748a
Merge remote-tracking branch 'upstream/2017.7' into merge-2018.3
2018-11-21 07:19:22 -06:00
Erik Johnson
1b8a8acbbb
Merge pull request #50592 from terminalmage/docs-2017.7
...
Disable unused shorturls plugin (backport to 2017.7)
2018-11-21 07:18:26 -06:00
Erik Johnson
db157766a0
Remove overline from section title
...
This causes a warning on newer Sphinx releases
2018-11-20 18:58:29 -06:00
Erik Johnson
8127dd5bb4
Disable unused shorturls plugin
...
It was causing build errors when SPHINXOPTS=-W is used
2018-11-20 18:21:25 -06:00
Daniel Wozniak
60b4622570
Merge pull request #50366 from jdsieci/2018.3-fix-issue50254
...
2018.3 fix issue50254
2018-11-20 13:31:29 -07:00
Gareth J. Greenaway
1f5aa4b883
pkg.installed currently fails when sources is used along with hold: True. This was due to a change in #48426 that swapped out sending the pkgs variable for the desired variable instead. This caused problems with pkg.hold because desired and sources are always populated, and pkg.hold can only include one or the other. This change just includes desired in the call to pkg.hold since desired has the same value for sources.
2018-11-20 12:24:27 -08:00
Gareth J. Greenaway
6d2309da50
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host
2018-11-20 08:44:05 -08:00
Mike Place
807068d082
Typo fix
2018-11-20 09:42:48 -07:00
Mike Place
2ef8307a68
Typo fix
2018-11-20 09:42:30 -07:00
Mike Place
7c8957ac68
Typo fix
...
This was my fault in the original
2018-11-20 09:42:12 -07:00
Mike Place
735c9f431b
Merge pull request #50580 from garethgreenaway/50155_artificatory_download_state_test_true
...
[2018.3] Adding test=True to artifactory.download.
2018-11-20 09:37:13 -07:00
Gareth J. Greenaway
c1ca60399b
Merge branch '2018.3' into bp-50549
2018-11-19 17:11:15 -08:00
Gareth J. Greenaway
7dd57d0352
Lint.
2018-11-19 16:49:20 -08:00
Gareth J. Greenaway
3661ee071a
Adding test=True to artifactory.download.
2018-11-19 16:42:11 -08:00
Gareth J. Greenaway
db89b27ff2
Merge branch '2018.3' into 50542_mysql_ensure_verify_login_uses_connection_host
2018-11-19 15:22:57 -08:00
Mike Place
015834ded9
Merge pull request #50577 from garethgreenaway/bp-50397
...
Back-port PR #50397 to 2018.3
2018-11-19 14:28:41 -07:00
Thomas Lemarchand
dd2d8725db
Documentation
2018-11-19 12:16:48 -08:00
Thomas Lemarchand
af6d21f772
Import unicode_literals from future and add versionadded tag
2018-11-19 12:16:42 -08:00
Thomas Lemarchand
09dc09d88d
Disable powershell modules list
...
Add list_kbs function
2018-11-19 12:16:35 -08:00
Thomas Lemarchand
05852d0865
pchanges to changes
...
named parameters
2018-11-19 12:16:27 -08:00
Thomas Lemarchand
16525e4312
Add Win WUSA management, to install Windows Update files (.msu).
...
Fixes #46292
2018-11-19 12:16:10 -08:00
Mike Place
b163380cb1
Add security credits to release notes
2018-11-19 12:12:33 -08:00
Erik Johnson
12e0d80271
Merge pull request #50570 from garethgreenaway/merge-2018.3
...
[2018.3] Merge forward from 2017.7 to 2018.3
2018-11-19 14:04:04 -06:00
Gareth J. Greenaway
4c85119a57
merge-forward 2017.7 to 2018.3
2018-11-19 10:39:38 -08:00
Gareth J. Greenaway
6fba83c294
Merge pull request #50519 from garethgreenaway/50266_core_virtual_grain_fixes
...
[2018.3] Fix to virtual core grain
2018-11-16 15:42:17 -08:00
Gareth J. Greenaway
dcae2f08c4
Merge branch '2018.3' into 50266_core_virtual_grain_fixes
2018-11-16 14:48:33 -08:00
Gareth J. Greenaway
0284323d50
Ensure that verify_login is using the host from the connection_args and not the host associated with the user. Adding a test to ensure user_exists when the passed host is the MySQL wildcard %.
2018-11-16 14:01:31 -08:00
Daniel Wozniak
02238a7c0b
Merge pull request #50520 from dwoz/issue_50459
...
Always set .gitconfig dir to user's home
2018-11-16 10:27:45 -07:00
Erik Johnson
84edd6269e
Merge pull request #50427 from sathieu/bp-git_pillar_tests
...
Backports git_pillar tests improvements to 2018.3
2018-11-16 10:37:28 -06:00
