valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,942 Commits 24 Branches 182 Tags 341 MiB
2b323df453
Commit Graph

86942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
62cc0dffd6
Merge pull request #49231 from minusf/mount-check-name 
Check for mandatory parameters for `mount.mounted`
 2018-08-22 09:26:03 -06:00
Mike Place
d55d484174
Merge pull request #49242 from dwoz/blockreplace_better_fix 
Blockreplace better fix
 2018-08-22 09:21:29 -06:00
Daniel Wallace
85f6d36f0e
Merge pull request #49236 from terminalmage/issue32737 
Allow compound matching in eauth config expressions
 2018-08-22 07:57:02 -05:00
Daniel A Wozniak
72c37271a5
Use six to make sure content is unicode 2018-08-22 01:05:53 -07:00
Daniel A Wozniak
1bf0b18224
Better blockfix replace 2018-08-21 16:15:11 -07:00
Daniel A Wozniak
dd4fcd3445
Revert "Multiple block replace test fixes" 
This reverts commit 94ac2b4fc7.
 2018-08-21 16:15:10 -07:00
twangboy
d3358423ae
Use os.linesep.join instead of textwrap.dedent 2018-08-21 16:15:07 -07:00
Erik Johnson
233bbae62f
Allow compound matching in eauth config expressions 
When we try to match the configured expression, we look for a match type
(e.g. `I@`, `G@`, etc.) at the beginning, and when we don't find one we
were falling back to a glob. This changes the fallback to compound so
that we can support compound matches. Note that the compound matching
engine will act just like the glob match engine when the host passed to
it is a single minion ID glob, so using compound as the fallback gets
you glob matching for free.
 2018-08-21 14:54:39 -05:00
Frantisek Holop
eb5cab35ca fix some underhanging indent while here... 2018-08-21 16:09:29 +02:00
Frantisek Holop
ec2a091376 check for mandatory parameters to avoid false positives 2018-08-21 16:08:10 +02:00
Daniel Wozniak
0eb6ddf0e8
Merge pull request #49218 from twangboy/fix_installer 
Fix Windows and OSX installers
 2018-08-20 18:10:29 -07:00
twangboy
ff5ec86252
Work with seconds 2018-08-20 17:36:55 -06:00
twangboy
e8a1d2f772
Add more descriptive error when KB not found 2018-08-20 17:04:10 -06:00
twangboy
71737ea687
Suppress all ui on vcredist installation 2018-08-20 16:48:39 -06:00
twangboy
7dae9bb2a1
Fix Windows and OSX installers 
Adds support to Universal Runtime Libraries (UCRT) for Windows
Adds futures to the req.txt for OSX
 2018-08-20 16:11:34 -06:00
Daniel Wallace
5ba7f60f03
Merge pull request #49187 from erwindon/py27fixnumberformat 
Fix for #45620: "Salt CLI is rounding floats to 2 decimal places"
 2018-08-20 13:59:09 -05:00
Erwin Dondorp
12261a543e trailing whitespace removal 2018-08-19 12:06:15 +02:00
Erwin Dondorp
2149e228ac Fix for #45620: "Salt CLI is rounding floats to 2 decimal places" (actually: Salt CLI is using only 12 digits for precision) 
use repr() to get the full precision also for older python versions
as until about python32 it was limited to 12 digits only by default
 2018-08-19 12:06:15 +02:00
Mike Place
f8c55b85e1
Merge pull request #49184 from ralish/external_nodes_docs 
Remove obsolete documentation on external_nodes setting
 2018-08-18 08:50:10 -04:00
Mike Place
65205a4187
Merge pull request #49185 from ralish/enable_gpus_grains_doc 
Update documentation to correctly state enable_gpu_grains default
 2018-08-18 08:48:33 -04:00
Mike Place
5aa282ea65
Merge pull request #48032 from zer0def/parted-naming 
Fixed partition names with spaces effectively containing only the first word.
 2018-08-18 08:38:44 -04:00
Mike Place
0157eacffc
Merge pull request #49164 from terminalmage/issue49154 
Fix bug in keep_source for non-templated salt:// file sources
 2018-08-18 08:11:57 -04:00
Mike Place
4fe38dccbc
Merge branch '2017.7' into external_nodes_docs 2018-08-18 08:08:53 -04:00
Daniel Wozniak
b510441803
Merge pull request #49179 from dwoz/test_unit_states_file 
Account for normalized dirs in unit tests
 2018-08-17 21:07:48 -07:00
Samuel D. Leslie
2fe675cfdd
Update documentation to correctly state enable_gpu_grains default 
While the relevant code in grains/core.py does enable GPU grains by
default, the default in config/__init__.py for the DEFAULT_MASTER_OPTS
dictionary is disabled. This takes precedence over the default in
grains/core.py which would only take effect if the enable_gpu_grains
setting was not specified at all.
 2018-08-18 13:47:53 +10:00
Samuel D. Leslie
2e29b292bf
Remove obsolete documentation on external_nodes setting 
This setting is no longer used anywhere in the codebase having been
superseded by the master_tops setting many releases ago.
 2018-08-18 13:11:02 +10:00
Daniel A. Wozniak
913ea5ebde
Fix directory unit test 2018-08-17 14:07:19 -07:00
Daniel A. Wozniak
3363238ff6
Account for normalized dirs in unit tests 2018-08-17 13:17:08 -07:00
Daniel Wozniak
7486fd5447
Merge pull request #49162 from erwindon/wheel_error_error 
Fixed unknown 'exceptions' under Python3 (#49152)
 2018-08-17 10:37:17 -07:00
Mike Place
7043286d6c
Merge pull request #49143 from Ch3LL/bp-49142 
[2017.7] Backport #49142
 2018-08-17 16:40:39 +02:00
Mike Place
ca5df0498e
Merge branch '2017.7' into wheel_error_error 2018-08-17 16:22:33 +02:00
Mike Place
c2aba7abde
Merge branch '2017.7' into issue49154 2018-08-17 16:14:08 +02:00
Daniel Wallace
8ab55f5552
Merge pull request #49167 from dwoz/filefix 
Fix remaining file state integration tests (py3)
 2018-08-17 08:31:40 -05:00
Erwin Dondorp
4335c5cdc4 Must have 2 lines between imports and code 2018-08-17 12:29:22 +02:00
Erwin Dondorp
ec1f013573 Improved solution as per @dwoz's suggestion 2018-08-17 11:14:40 +02:00
Daniel A. Wozniak
b5ba073d65
Simplify dict keys lookup 2018-08-16 23:33:52 -07:00
Daniel A. Wozniak
6844251315
Fix remaining file state integration tests (py3) 2018-08-16 19:57:39 -07:00
twangboy
7264008fed
Fix some lint (remove whitespace)` 2018-08-16 15:04:07 -06:00
twangboy
4f9973db20
Improve timeout in delete 
Improved error handling
 2018-08-16 15:01:18 -06:00
twangboy
a6ecb7552d
Remove testing debug stuff 2018-08-16 14:03:16 -06:00
twangboy
7dd795322e
Fix start/stop functions 
Fix typo in the dict key 'Status'
Standardize docs
Fix some lint issues
Rename the new helper function to _status_wait
Add urls to code comments
Add version added statements
 2018-08-16 14:00:38 -06:00
Erik Johnson
b4544d7f89
Add keep_source integration tests 2018-08-16 14:53:32 -05:00
Daniel Wozniak
90bd56063e
Merge pull request #49163 from dwoz/tmp_dir 
Allow test suite to finish if tmp dir removal fails
 2018-08-16 12:32:15 -07:00
Erik Johnson
82638c6dd2
Fix bug in keep_source for non-templated salt:// file sources 
Unless the file is one of A) a remote file source (http/https/ftp/etc.)
or B) being templated, then `file.get_managed` does not cache the file.
Thus, the variable we rely on to tell us the cached path is an empty
string, and we don't remove it even though the file would eventually
later be cached when we run `file.manage_file`. This adds some
additional logic to ensure that we do check if the file has been cached
if `sfn` is an empty string.
 2018-08-16 14:01:15 -05:00
Daniel A. Wozniak
3384864e8f
add Exception type 2018-08-16 11:57:28 -07:00
Daniel A. Wozniak
9da79dd0b5
Allow test suite to finish if tmp dir removal fails 2018-08-16 10:48:19 -07:00
Erwin Dondorp
20f134edea Fixed unknown 'exceptions' under Python3 (#49152) 2018-08-16 19:18:18 +02:00
Shane Lee
fade0a6acd
Merge pull request #10 from damon-atkins/patch-1 
2017_win_service
 2018-08-16 10:25:14 -06:00
Damon Atkins
57c4b9ff55
2017_win_service_damon 
Merge this if you like the suggestion.
 2018-08-16 14:58:35 +10:00
twangboy
d44eaeed6c
Add timeout support to the state 
Remove redundent net stop command from the stop function
Remove extra _enable call on Windows that was causing incorrect state
return comments
 2018-08-15 19:20:46 -06:00