valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
85,580 Commits 24 Branches 182 Tags 341 MiB
0e42e8f9cc
Commit Graph

85580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
0e42e8f9cc Merge pull request #43188 from alexbleotu/ext_pillar_config_param-gh 
Ext pillar config param gh
 2017-09-11 12:58:01 -06:00
Mike Place
e7a411c7f4 Merge pull request #43252 from rallytime/utils-files-moves 
Move salt.utils.istextfile to salt.utils.files.is_text_file
 2017-09-11 12:42:40 -06:00
Mike Place
940995c40d Merge pull request #43273 from lordcirth/add-nfs-state 
Add nfs_export state
 2017-09-11 11:49:40 -06:00
Mike Place
49288993c0 Merge pull request #43437 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 30
 2017-09-11 11:40:47 -06:00
Mike Place
2964707e5d Merge pull request #43341 from ixs/fedora-rh_ip 
Fix rh_ip template use for Fedora
 2017-09-11 10:30:53 -06:00
rallytime
eb91a073d8 Reduce the number of days an issue is stale by 30 2017-09-11 12:12:33 -04:00
Mike Place
9f421dde89 Merge pull request #43370 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-11 09:38:20 -06:00
Mike Place
654218bf65 Merge pull request #43392 from spenceation/panos/2017.9.6 
Panos 2017.9.6
 2017-09-11 09:25:48 -06:00
rallytime
e11aa7e5ef Adjust test mocking to handle __utils__['files.is_text_file'] 2017-09-11 10:25:00 -04:00
rallytime
eea53a1244 Change salt.utils.files.is_text_files calls to use __utils__ 2017-09-11 10:21:43 -04:00
rallytime
e1621f7b2e Lint: Add range import from six 2017-09-11 10:21:43 -04:00
rallytime
1279556873 Move salt.utils.istextfile to salt.utils.files.is_text_file 
Moves the original function to `salt.utils.files.py`, adds a deprecation
warning to the original function, and updates all of the istextfile
references in salt code.
 2017-09-11 10:21:43 -04:00
Alexandru Bleotu
0882fed61a Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-10 18:46:57 +01:00
Nathan Fish
54dd4d3ef7 nfs_exports: linting and versionadded 2017-09-08 11:59:27 -05:00
spenceation
2d6e8e7a7c Added high availability execution module for PANOS proxies. 
Fixes XPATH formatting on set commands.
Fixes PANOS proxy ping function.
 2017-09-07 15:11:58 -04:00
Nicole Thomas
3c454d4156 Merge pull request #43125 from pabloh007/docker-present-pass-kwargs 
Added feature to pass kwargs to the build process for docker_image.pr…
 2017-09-07 13:46:56 -04:00
Nicole Thomas
e9a5fd4f93 Merge pull request #43195 from moio/expand-list_pkg-attr-parameter 
list_pkg attr parameter: add support for epoch, release
 2017-09-07 13:36:22 -04:00
Alexandru Bleotu
103ef69016 Merge branch 'develop' into ext_pillar_config_param-gh 2017-09-06 18:49:37 +01:00
Alexandru Bleotu
33feda7a5b Mocked salt.utils.args.get_function_argspec instead of inspect.getargspec in all external pillar data tests 2017-09-06 12:26:40 -04:00
Alexandru Bleotu
ec9f29cb56 Changed inspect.getargspec to salt.utils.args.get_function_argspec 2017-09-06 12:26:38 -04:00
Nicole Thomas
7d462d29c2 Merge branch 'develop' into expand-list_pkg-attr-parameter 2017-09-06 12:15:01 -04:00
Nathan Fish
0ce48eecd7 states/nfs_export: add __virtual__() 2017-09-06 11:03:02 -05:00
Nathan Fish
889a556e85 modules/nfs3: linting 2017-09-06 10:40:37 -05:00
rallytime
5701d54516 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/state.py
  - salt/utils/gitfs.py
 2017-09-06 09:39:27 -04:00
Andreas Thienemann
6aefa5c3f8 Update unit test to provide osmajorrelease grain. 2017-09-06 03:46:00 +02:00
Mike Place
1ddf818b41 Merge pull request #42336 from cloudflare/textfsm-mod 
New execution module: textfsm
 2017-09-05 17:28:30 -06:00
Mike Place
7ba405add5 Merge pull request #43050 from epcim/nacl_for_ext_pillar 
Nacl for ext pillar [WIP]
 2017-09-05 16:51:19 -06:00
Nicole Thomas
015cbc57d9 Merge pull request #43159 from jubrad/bp-43018 
Bp 43018
 2017-09-05 18:29:15 -04:00
Nicole Thomas
f19274e1b4 Merge pull request #43222 from rallytime/oxygen-warnings-env 
Remove deprecation warnings for "env"
 2017-09-05 18:24:54 -04:00
Nicole Thomas
cfc08147e9 Merge pull request #43304 from duk3luk3/feature-16313-file-recurse-replace 
Feature: Add `replace` parameter to file.recurse state
 2017-09-05 18:24:27 -04:00
Mike Place
a414325a82 Merge pull request #43070 from lyft/support-states-returning-a-list-of-comments 
Support states returning a list for ret['comment']
 2017-09-05 16:19:26 -06:00
Mike Place
c7e60a71f7 Merge pull request #43082 from johnj/distributed-master-selection 
Add distributed as a master_type option
 2017-09-05 16:17:39 -06:00
Pablo Hernandez
49677b4854 Merge branch 'develop' into docker-present-pass-kwargs 2017-09-05 14:59:09 -07:00
Mike Place
f902bd8bc9 Merge pull request #43152 from garethgreenaway/adding_custom_beacons 
Adding custom beacons with beacon module
 2017-09-05 15:37:39 -06:00
Mike Place
6e1b541b46 Merge pull request #43232 from terminalmage/gitfs-inheritance 
Improve inheritance in salt.utils.gitfs
 2017-09-05 14:37:05 -06:00
Mike Place
086b220091 Merge pull request #43238 from s0undt3ch/2017.7 
Include the line number by default on the log file format
 2017-09-05 14:31:53 -06:00
Mike Place
11d26d446b Merge pull request #43303 from liquidgecka/develop 
Ensure that the win_pki.import_cert module doesn't fail randomly.
 2017-09-05 14:21:09 -06:00
Mike Place
9c57869234 Merge pull request #43276 from rallytime/utils-state-moves 
Move state-related utils to salt.utils.state.py
 2017-09-05 14:20:08 -06:00
Mike Place
09dc58cde5 Merge pull request #43294 from twangboy/win_build_scripts 
Win build scripts
 2017-09-05 14:12:53 -06:00
Nicole Thomas
c20b919d3b Merge pull request #43355 from treba123/patch-1 
Silence error message in lvm.lv_present
 2017-09-05 16:10:53 -04:00
Mike Place
dac73fccf4 Merge pull request #43329 from johnj/fix-43295 
Fix #43295, better handling of consul initialization
 2017-09-05 14:06:04 -06:00
Aneesh Agrawal
ba63920874 Support states returning a list for ret['comment'] 
Some states are complicated and multiple subparts,
or maybe cross-call into __states__ if they manage subresources.
In these cases, they will have multiple comments.
Make this more ergonomic by supporting a list of strings as the
value for ret['comment'] in state returns and documenting this.
By joining comments on newlines, it is possible to combine
single-line and multi-line comments cleanly, as opposed to e.g. commas.

The driving impetus for this is some of the boto modules.
An update to the boto_sqs module is included as an example.

Add a check that outgoing state return data has the right shape,
and add a testcase as well.
Fix the NPM state tests and the saltmod runner & wheel state functions
to comply with the prescribed format.
 2017-09-05 19:52:42 +00:00
Mike Place
21ab306ef4 Merge pull request #43322 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-05 12:21:25 -06:00
Mike Place
150c853140 Merge pull request #43323 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-09-05 12:20:13 -06:00
Mike Place
d9e5c2d8d5 Merge pull request #43326 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 15
 2017-09-05 11:57:31 -06:00
John Jawed
1b4583b425 Fix #43295, better handling of consul initialization issues 2017-09-05 09:47:21 -07:00
Nicole Thomas
62429c547d Merge pull request #43324 from twangboy/fix_unit.modules.test_chef 
Fix `unit.modules.test_chef` for Windows
 2017-09-05 12:40:10 -04:00
Robert Mader
a4c693bf2f Use quiet mode of lvdisplay in lvpresent 2017-09-05 18:18:58 +02:00
Robert Mader
9e64ea814c Add quiet mode to lvdisplay 2017-09-05 18:16:15 +02:00
rallytime
ed9b45ceaa Adjust a couple more tests to handle __utils__['state.check_result'] mocking 2017-09-05 10:11:11 -04:00