valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
99,014 Commits 24 Branches 182 Tags 341 MiB
a8ca8f71ba
Commit Graph

99014 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
a8ca8f71ba
Merge pull request #50512 from Ch3LL/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-11-15 09:38:42 -05:00
Nicole Thomas
9c24fb6373
Merge pull request #50498 from terminalmage/fluorine-docs 
Fix docs build warnings in fluorine
 2018-11-14 14:27:06 -05:00
Erik Johnson
1d39f88301
Make fluorine docs use the latest available release for download links 2018-11-14 12:45:05 -06:00
Ch3LL
8501581f27
Merge branch '2018.3' into 'fluorine' 
Conflicts:
  - salt/utils/mac_utils.py
  - salt/utils/win_runas.py
  - tests/support/case.py
 2018-11-14 12:38:16 -05:00
Nicole Thomas
55b4914644
Merge pull request #50502 from twangboy/lgpo_2018.3 
Add definition for RestrictRemoteSAM
 2018-11-14 09:30:37 -05:00
Erik Johnson
ae96e29032
Fix docs configuration for renamed logstash engine 2018-11-13 19:05:29 -06:00
Nicole Thomas
9e63cde7c5
Merge pull request #50472 from cbosdo/fluorine-backport 
Fix virt.update for NICs mac and model
 2018-11-13 16:17:30 -05:00
Erik Johnson
3adcfacc8b
Set docs jenkins job to treat warnings as errors 2018-11-13 14:59:51 -06:00
Erik Johnson
d7a31803b7
Update docs references for states with func_alias 2018-11-13 14:59:51 -06:00
Erik Johnson
06be9d2896
Disable custom sphinx automodule 
This causes a warning and doesn't provide a tangible benefit since we
have CLI examples for functions.
 2018-11-13 14:53:13 -06:00
twangboy
fe92a3a506
Add definition for RestrictRemoteSAM 2018-11-13 13:14:58 -07:00
Mike Place
c1dde7e9b1
Merge pull request #50328 from rallytime/fix-48734 
Fix issue with salt-run jobs.list_jobs where Target: unknown-target
 2018-11-13 12:49:57 -07:00
Daniel Wozniak
351faeb952
Merge pull request #50499 from dwoz/build_fix 
Fix 2018.3 build
 2018-11-13 11:46:54 -07:00
Daniel A. Wozniak
5754b4a7c6
Fix 2018.3 build 2018-11-13 11:33:26 -07:00
Mike Place
6f4b23f689
Merge pull request #50496 from terminalmage/2018.3-docs 
Fix 2018.3 docs build warnings
 2018-11-13 10:21:08 -07:00
Erik Johnson
ee835b10bc
Fix fluorine docs build warnings 2018-11-13 11:10:11 -06:00
Nicole Thomas
6b272c1d65
Merge pull request #50492 from rallytime/bp-50228-and-50443 
Back-port #50228 and #50443 to 2018.3
 2018-11-13 11:59:14 -05:00
rallytime
7879a2d791
Fix logging format 2018-11-13 11:27:57 -05:00
Erik Johnson
9754791db6
Fix header underline length to avoid another sphinx warning 2018-11-13 10:19:33 -06:00
Erik Johnson
cb256418a9
Fix header underline length to avoid another sphinx warning 2018-11-13 10:18:47 -06:00
Erik Johnson
d6e1ee47c1
Fix more sphinx build errors 2018-11-13 10:17:55 -06:00
Erik Johnson
82bedb4b46
Late import to fix docs build errors 2018-11-13 10:17:54 -06:00
Erik Johnson
7c298b27b0
Fix sphinx build warnings in 2018.3 branch 
The async renaming for Python 3.7 needed to be reproduced here as well.
 2018-11-13 10:17:37 -06:00
Erik Johnson
9272f7b735
Fix more sphinx build errors 2018-11-13 09:56:42 -06:00
Erik Johnson
18a8104aae
Late import to fix docs build errors 2018-11-13 08:48:43 -06:00
Erik Johnson
d4571328ed
Fix sphinx build warnings in 2018.3 branch 
The async renaming for Python 3.7 needed to be reproduced here as well.
 2018-11-13 08:47:12 -06:00
rallytime
f578392eb4
Lint Fix: add mock_open import 2018-11-13 09:30:02 -05:00
Wesley Whetstone
e5b999ba99
add try/except when checking for service Label 2018-11-13 09:22:58 -05:00
Shea Craig
3c36bddd8a
Fix linting errors. 2018-11-13 09:22:24 -05:00
Shea Craig
fab57de795
Write tests to handle invalid launchd plist XML. 2018-11-13 09:21:58 -05:00
Shea Craig
bb429b0dff
Condense service result assertions, add a binary plist test. 2018-11-13 09:21:58 -05:00
Shea Craig
a809fef417
Factor out another helper function, implement broken symlink test. 2018-11-13 09:21:58 -05:00
Shea Craig
216f7ef864
Update testing for mac_utils services. 
This commit begins to go over the existing testing for mac_utils,
applying the updated best-practices from the unit testing section of the
Salt docs.

Wherever possible, I've tried to keep the data for each test within the
test, while factoring out repetitive functions. In this commit, for
example, the `os.walk` side_effect func has been factored into its own
helper function.

This commit begins looking at what is being tested for this module and
making it more specific, specifically to test one thing per test
(existing tests had multiple asserts and in some casaes were actually
malformed such that the tests would pass, but in actual use, code would
throw an exception and skip over the block).
 2018-11-13 09:21:57 -05:00
Shea Craig
89d826738f
Fix trailing-slash bug in User LaunchAgent appending. 
I discovered this issue while updating the tests, so there's no open
issue for it.
 2018-11-13 09:13:37 -05:00
Shea Craig
0e23b6e7f1
Handle bad plists by ignoring them, with py2 and py3 specific approaches 2018-11-13 09:13:07 -05:00
Shea Craig
fa4414949b
Avoid AttributeError when checking for exception types. 2018-11-13 09:11:19 -05:00
Shea Craig
fd62b336dc
Add secondary exception handler for malformed plists. 2018-11-13 09:11:19 -05:00
Shea Craig
ae6f49b0b1
Make test correctly generate a double exception. 2018-11-13 09:11:18 -05:00
Nicole Thomas
6bb458d440
Merge pull request #50482 from rallytime/merge-fluorine 
[fluorine] Merge forward from 2018.3 to fluorine
 2018-11-13 08:56:11 -05:00
Erik Johnson
1cc9f491d2
Merge pull request #50131 from gtmanfred/fluorine 
cache signing file data
 2018-11-13 07:30:11 -06:00
Daniel Wozniak
da980d9bdb
Merge pull request #50486 from twangboy/lgpo_2018.3 
Back port lgpo from Fluorine
 2018-11-13 02:40:16 -07:00
Daniel Wozniak
7dd34386ef
Merge pull request #50456 from terminalmage/issue50218 
Two bugfixes
 2018-11-12 23:06:51 -07:00
twangboy
bbbc07b65f
Back port lgpo from Fluorine 2018-11-12 16:59:08 -07:00
Nicole Thomas
d8514e6b7e
Merge pull request #50455 from dubb-b/2018.3 
Adding the released version as the bootstrap minion.
 2018-11-12 17:52:52 -05:00
Nicole Thomas
cfb33511df
Merge pull request #50483 from rallytime/bp-50272 
Back-port #50272 to 2018.3
 2018-11-12 17:45:05 -05:00
Nicole Thomas
360ae6a955
Merge pull request #50481 from rallytime/merge-2018.3 
[2018.3] Merge forward from 2017.7 to 2018.3
 2018-11-12 17:44:14 -05:00
Erik Johnson
0f02da7fec
Remove unnecessary u prefix from string literals 
These are redundant with unicode_literals being used
 2018-11-12 16:45:28 -05:00
Erik Johnson
fc26ae8ea3
Add unit test for comparing containers with the same env vars 2018-11-12 16:45:22 -05:00
Joanna Yurdal
cf7cb4beeb
extra blank line after function definition(pylint) 2018-11-12 16:45:14 -05:00
Joanna Yurdal
1de9ce382d
Compare sorted docker environment 2018-11-12 16:45:08 -05:00