Nicole Thomas
c032439a0e
Merge pull request #44542 from lozzd/patch-1
...
Clarify error for compound command arguments
2017-11-17 12:13:16 -05:00
Nicole Thomas
7c0398a8bd
Merge pull request #44500 from abhipallav/add-chocolatey-timeout
...
Add support for Chocolatey execution timeout
2017-11-16 15:54:24 -05:00
Nicole Thomas
0300c6be09
Merge pull request #44506 from gugu/develop
...
[kubernetes] Support for Bearer authentication
2017-11-16 15:53:29 -05:00
Ajit Abhipallav
c0eb189050
Add Chocolatey execution timeout support
2017-11-16 23:11:29 +05:30
Nicole Thomas
2d0e3a77cc
Merge branch 'develop' into develop
2017-11-16 09:55:05 -05:00
Erik Johnson
0e87a90f8d
Merge pull request #44543 from rallytime/fix-groupadd-tests
...
Groupadd test gid_min/gid_max values should be ints
2017-11-16 06:36:22 -08:00
Andrii Kostenko
4eb3f65776
Support for Bearer authentication
2017-11-16 10:28:31 +02:00
Laurie Denness
f2b2c96e17
Merge branch 'develop' into patch-1
2017-11-15 13:59:26 -05:00
Daniel Wallace
5a8ba39dd7
Merge pull request #44052 from tylerjones4508/docker_util
...
Docker util
2017-11-15 08:51:11 -07:00
Nicole Thomas
087cbc7eaa
Merge pull request #44529 from cloudflare/add-mandrill-mod
...
Add mandrill mod
2017-11-15 08:25:26 -05:00
Tyler Jones
3d77e27830
Merge branch 'develop' into docker_util
2017-11-14 18:25:33 -05:00
Nicole Thomas
4315c20195
Merge branch 'develop' into add-mandrill-mod
2017-11-14 17:29:52 -05:00
Nicole Thomas
62ca0335db
Merge pull request #44540 from vernondcole/saltify-wol-fix-ping
...
fix no __salt__ in salt-cloud
2017-11-14 17:26:53 -05:00
Nicole Thomas
58cbf9527f
Merge pull request #44523 from jacobweinstock/add-opts-to-cloud-runner-action-destroy
...
add ability to customize cloud config options in cloud runner functio…
2017-11-14 17:24:06 -05:00
Nicole Thomas
2c6f8f5f9e
Merge pull request #44510 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-14 17:21:13 -05:00
Laurie Denness
16033fbd6a
Clarify error for compound command arguments
...
Previously, if the number of arguments didn't match the number of commands, the error was the same. This might lead you to believe you've not specified enough arguments, when actually, you've supplied too many for the command you're trying to run. This change clarifies which you did. Functionally, no change.
2017-11-14 15:35:45 -05:00
rallytime
37e16cd191
Groupadd test gid_min/gid_max values should be ints
...
This fixes an issue with the groupadd integration tests. There were
two tests failing on CentOS 7 that check to ensure that the gid for
the newly added system group is between the gid_min and gid_max values.
These checks were failing because the test gid was an int, but the
compairison gids (min and max values) were strings, depending on the
distro.
This change ensures that we're compairing ints across the board.
2017-11-14 15:32:39 -05:00
Nicole Thomas
639edfeb9a
Merge pull request #44532 from cloudflare/fix-out-doc
...
Fix a documentation detail of the out execution module
2017-11-14 15:08:42 -05:00
Nicole Thomas
833a2210f3
Merge pull request #43818 from bodhi-space/infra5669
...
INFRA-5669 - add API throttling handlers to boto_asg exec module
2017-11-14 14:29:10 -05:00
Tyler Jones
ef55f87f63
Merge branch 'docker_util' of github.com:tylerjones4508/salt into docker_util
2017-11-14 18:56:12 +00:00
Tyler Jones
3c8c497e03
Fixing 2 pylint errors, missed server_name
2017-11-14 18:55:30 +00:00
Tyler Jones
b97bb46666
Merge branch 'develop' into docker_util
2017-11-14 13:08:36 -05:00
Tyler Jones
9f2189c3b1
Adding __context__ and return fixes
2017-11-14 17:56:03 +00:00
Mircea Ulinic
da2611c27d
Fix out module doc
2017-11-14 12:34:32 +00:00
Mircea Ulinic
777d01e82a
Add tests for the mandrill execution module
2017-11-14 11:26:56 +00:00
Mircea Ulinic
88c7992bc8
Doc ref the new mandrill exec mod
2017-11-14 11:24:54 +00:00
Mircea Ulinic
1891a23f2e
Implement the Mandrill execution module
2017-11-14 11:24:44 +00:00
vernoncole
719bd30a23
fix no __salt__ in salt-cloud
2017-11-13 20:42:14 -07:00
Tyler Jones
9af65b6af2
fixing virtualname, and other small fixes
2017-11-14 01:35:16 +00:00
Jacob Weinstock
88370025c8
fixed syntax error
2017-11-13 18:19:34 -07:00
Jacob Weinstock
722ed9effd
add ability to customize cloud config options in cloud runner functions: destroy, action and map_run
2017-11-13 18:10:38 -07:00
Tom Williams
18ae529432
Merge branch 'develop' into infra5669
2017-11-13 19:35:29 -05:00
Tyler Jones
ae2bbd4d96
Fixing docs,versionadded,formating, and adding the salt.modules.swarm.rst file
2017-11-14 00:08:52 +00:00
Tyler Jones
4144b9b573
Updating with more documentation in the doc string and examples. Removed the variables client = docker.from_env() and server_name and added them to the __init__ function
2017-11-13 23:11:44 +00:00
Nicole Thomas
a5bb896ff1
Merge pull request #44340 from gracinet/42713_mine.get_back_compat
...
Backwards compat for mine.get on pre-Nitrogen minions
2017-11-13 16:49:51 -05:00
Nicole Thomas
2dde13407b
Merge pull request #44369 from sjorge/pkgin_uptodate
...
Implement pkg.uptodate for pkgin
2017-11-13 15:43:46 -05:00
Erik Johnson
df972db3ba
Merge pull request #42930 from CorvinM/issue36942
...
Jinja line statements and comments
2017-11-13 12:02:16 -08:00
Mike Place
97863f338a
Merge pull request #43410 from skob/develop
...
queue.insert_runner with sqlite backend
2017-11-13 12:47:32 -07:00
Mike Place
28e1160c41
Merge pull request #43474 from kstreee/separate-key-dir-from-cache-dir
...
Separates 'key_dir' from 'cache_dir', The key files (i.e. '.root_key', '.sudo_ACCOUNT_NAME') must not be shared with other masters.
2017-11-13 12:41:28 -07:00
Mike Place
85597e24fb
Merge pull request #43406 from rtx3/consul-module-add-acl
...
Add ACL token to Consul module
2017-11-13 12:37:42 -07:00
Mike Place
3af0031e02
Merge pull request #43504 from isbm/isbm-ansible-module-dev
...
Got Ansible own modules? Run them from within the Salt just like that!
2017-11-13 12:28:25 -07:00
Mike Place
9ef3e40ffb
Merge pull request #43780 from connordelacruz/develop
...
Fix issues #38855 , #41075 , #41717 , and #43912 with firewalld state and execution modules
2017-11-13 12:24:08 -07:00
Nicole Thomas
93c54d9884
Merge pull request #44414 from garethgreenaway/req_any
...
[develop] Adding additional requisites to state compiler
2017-11-13 14:17:09 -05:00
Nicole Thomas
8dcca13ca3
Merge pull request #44508 from mzbroch/capirca_integration
...
Capirca integration
2017-11-13 14:16:37 -05:00
Mike Place
c55dd75daf
Merge pull request #43822 from comsul/issues/42512
...
check_result: Correctly check the __extend__ state.
2017-11-13 12:13:38 -07:00
Mike Place
dd2844a645
Merge pull request #44196 from benediktwerner/develop
...
Fix autosign file permission check [develop]
2017-11-13 11:34:37 -07:00
Mike Place
2b9a4cf4c6
Merge pull request #44281 from ze42/compound_command
...
minion: don't hang on compound-command
2017-11-13 11:19:51 -07:00
Mike Place
fef389d6ea
Merge branch 'develop' into 42713_mine.get_back_compat
2017-11-13 11:07:35 -07:00
Mike Place
f3b9cc6137
Merge pull request #44419 from rongzeng54/develop
...
- fix "ValueError: too many values to unpack" bug
2017-11-13 10:46:02 -07:00
Mike Place
7701c299eb
Merge pull request #44455 from samodid/fix_38838
...
Fix for #38838
2017-11-13 10:40:34 -07:00
