Nicole Thomas
1e4dec5402
Merge pull request #43053 from DSRCorporation/bugs/43003_group_syndic_develop
...
Group minion events in Syndic.
2017-10-11 13:35:37 -04:00
Nicole Thomas
88c00ea198
Merge branch 'develop' into bugs/43003_group_syndic_develop
2017-10-11 13:35:16 -04:00
Nicole Thomas
3a078304d8
Merge pull request #43982 from terminalmage/salt.utils.data
...
Move 13 functions from salt.utils to salt.utils.data
2017-10-11 11:42:08 -04:00
garethgreenaway
aae062deeb
Merge pull request #44022 from garethgreenaway/mount_state_module_fix
...
[develop] Fix to mount state module
2017-10-11 08:27:06 -07:00
garethgreenaway
e30c797d9b
Merge pull request #43600 from vernondcole/vagrant-module
...
Vagrant module
2017-10-10 21:20:14 -07:00
garethgreenaway
f3699ade0a
Merge branch 'develop' into vagrant-module
2017-10-10 17:07:20 -07:00
Erik Johnson
ab8c224e07
Remove docstrings in salt.utils convenience functions
...
Having the duplicate docstrings makes CodeClimate cry.
2017-10-10 17:42:42 -05:00
Erik Johnson
d947ddf176
Move 13 functions from salt.utils to salt.utils.data
...
These functions are:
- salt.utils.compare_dicts
- salt.utils.compare_lists
- salt.utils.decode_dict
- salt.utils.decode_list
- salt.utils.exactly_n
- salt.utils.exactly_one
- salt.utils.traverse_dict
- salt.utils.filter_by
- salt.utils.traverse_dict_and_list
- salt.utils.subdict_match
- salt.utils.substr_in_list
- salt.utils.is_dictlist
- salt.utils.repack_dictlist
2017-10-10 17:42:42 -05:00
Nicole Thomas
bd6b4dc10b
Merge pull request #44006 from rallytime/follow-up-43946
...
Include versionadded tags for new key_text kwarg
2017-10-10 16:06:06 -04:00
Nicole Thomas
5406843d3f
Merge pull request #44018 from benediktwerner/develop
...
Fixed digitalocean cloud module doc file not being renamed by #43588
2017-10-10 15:57:55 -04:00
Nicole Thomas
5812334419
Merge pull request #43993 from benediktwerner/fix-sensehat-docs
...
Improved sensehat execution module documentation
2017-10-10 15:14:23 -04:00
Gareth J. Greenaway
349782635d
This should be mount_opts and I typoed it as opts. Fixing that.
2017-10-10 11:38:41 -07:00
Benedikt Werner
ac363eaae7
Fixec back-ticks in sensehat module
2017-10-10 20:32:29 +02:00
garethgreenaway
cdc6f947f1
Merge branch 'develop' into fix-sensehat-docs
2017-10-10 10:26:27 -07:00
Benedikt Werner
c5dde87d88
Renamed digitalocean cloud module doc file
2017-10-10 18:55:06 +02:00
garethgreenaway
4064bf4768
Merge branch 'develop' into vagrant-module
2017-10-10 08:27:16 -07:00
rallytime
293a369a95
Include versionadded tags for new key_text kwarg
...
Refs #43946 and #40040
2017-10-10 09:10:02 -04:00
Nicole Thomas
0cf0d78957
Merge pull request #43946 from jerrykan/apt_key_text_check
...
Document key_text option in pkgrepo state and add some checks
2017-10-10 09:06:16 -04:00
Nicole Thomas
a928dc9086
Merge pull request #43769 from mtorromeo/git-noexec-fix
...
Copy git ssh-id-wrapper to /tmp only if necessary (Fixes #10582 , #19532 )
2017-10-10 09:00:49 -04:00
Nicole Thomas
99e8c40b92
Merge pull request #43887 from techhat/azuredep
...
Add doc for new requirement (azurearm)
2017-10-10 08:51:51 -04:00
Vernon Cole
7501f5e256
Merge remote-tracking branch 'origin/vagrant-module' into vagrant-module
2017-10-09 20:46:15 -06:00
Vernon Cole
dfa91e379f
fix jenkins Python3 loader error warnings
2017-10-09 20:45:32 -06:00
Mike Place
77175275b8
Merge pull request #43944 from cavepopo/add-missing-param-lxc-proxmox-driver
...
Add missing param lxc proxmox driver
2017-10-09 17:18:49 -06:00
Mike Place
a7bbbbe7a6
Merge pull request #43950 from arthurlogilab/patch-23
...
[log/sentry] avoid KeyError: 'SENTRY_PROJECT'
2017-10-09 17:16:14 -06:00
Mike Place
09f211818d
Merge pull request #43920 from jdsieci/add_requisites_to_stateconf
...
Added missing requisites to stateconf renderer
2017-10-09 17:12:48 -06:00
Benedikt Werner
da0749cc05
Improved sensehat execution module documentation
2017-10-10 00:13:57 +02:00
garethgreenaway
82b92a20b9
Merge branch 'develop' into vagrant-module
2017-10-09 15:09:25 -07:00
Mike Place
bd557c1017
Merge pull request #43974 from isbm/isbm-tgttype-fix-dev
...
Bugfix: always return a string "list" on unknown job target type.
2017-10-09 15:25:15 -06:00
Mike Place
82b81e608a
Merge pull request #43981 from cachedout/radon_exclude_templates
...
Exclude templates in radon codeclimate test
2017-10-09 12:05:53 -06:00
Mike Place
d41de4ec16
Exclude templates in radon codeclimate test
2017-10-09 12:03:10 -06:00
Mike Place
efbe49fe60
Merge branch 'develop' into vagrant-module
2017-10-09 11:43:42 -06:00
Mike Place
fc931c64c9
Merge pull request #43979 from cachedout/lower_radon
...
Lower the radon threshold for CodeClimate
2017-10-09 11:40:20 -06:00
Mike Place
b8507c90ec
Lower the radon threshold for CodeClimate
...
Lower to 'D' which is cyclomatic complexity "moderate" or above.
More info on grading: http://radon.readthedocs.io/en/latest/commandline.html
2017-10-09 11:31:54 -06:00
garethgreenaway
80d258be0c
Merge pull request #43775 from Ch3LL/develop_docs
...
[develop] Bump latest and previous versions
2017-10-09 10:22:27 -07:00
garethgreenaway
76ff44bc84
Merge branch 'develop' into vagrant-module
2017-10-09 09:06:42 -07:00
Bo Maryniuk
1dc298c5eb
Bugfix: always return a string "list" on unknown job target type.
2017-10-09 17:57:48 +02:00
garethgreenaway
1ff27a4b2b
Merge pull request #43842 from vernondcole/unit-test-sdb
...
provide a unit test for the sdb utility
2017-10-09 08:00:23 -07:00
Joseph Hall
10282a0fe7
Typo
2017-10-06 14:42:30 -06:00
Mike Place
4c728301c7
Merge branch 'develop' into add-missing-param-lxc-proxmox-driver
2017-10-06 13:37:21 -06:00
Daniel Wallace
1f8ec5d335
Merge branch 'develop' into vagrant-module
2017-10-06 11:32:31 -06:00
garethgreenaway
11c7d3ab39
Merge branch 'develop' into unit-test-sdb
2017-10-06 07:28:42 -07:00
Joseph Hall
11e577b9ce
Add deps message to __virtual__()
2017-10-06 07:55:04 -06:00
Nicole Thomas
d136650b31
Merge pull request #43938 from terminalmage/salt.utils.user
...
Move several functions from salt.utils to salt.utils.user
2017-10-06 09:42:42 -04:00
Massimiliano Torromeo
63961cc7d9
Copy git ssh-id-wrapper to /tmp only if necessary ( Fixes #10582 , Fixes #19532 )
...
This adds a check that only copies the ssh wrapper to a temporary
location if git is to be run by a specific user and at the same time
the predefined wrapper file is not executable by "others" by verifying
every path part for the others executable bit.
By doing this the temp file is kept only as a last resort which should
work with salt-ssh as per bug #19532 , while avoiding a needless copy
on /tmp which could be potentially mounted with noexec as per
bug #10582 .
2017-10-06 15:00:52 +02:00
Arthur Lutz
4ce20bb2f7
[log/sentry] avoid KeyError: 'SENTRY_PROJECT'
...
if compute_scope is not present on transport registry, we can't
update options dictionnary with empty dsn_config dictionary
fix #43949
2017-10-06 13:10:34 +02:00
pierre.bellicini
6d36a9f9fa
Merge branch 'add-missing-param-lxc-proxmox-driver' of github.com:cavepopo/salt into add-missing-param-lxc-proxmox-driver
2017-10-06 10:34:17 +02:00
pierre.bellicini
08f59a0962
fix missing space after cores in lxc section
...
modified: salt/cloud/clouds/proxmox.py
2017-10-06 10:33:53 +02:00
Pier
ac56945f58
Merge branch 'develop' into add-missing-param-lxc-proxmox-driver
2017-10-06 10:24:47 +02:00
John Kristensen
b7edddd215
Document key_text option in pkgrepo state
...
The `key_text` option was added a while back but the documentation for
it was not included. It would be a good idea to have all options
documented properly.
2017-10-06 12:22:50 +11:00
John Kristensen
0cf411671e
Check the key_text option doesn't conflict with any other options
...
There are checks for `key_url` and `keyid`/`keyserver`, so we should
probably also have a check for `key_text` as well.
2017-10-06 12:20:18 +11:00
