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
Tom Williams
c2210aaf7c
INFRA-5978 - fix for https://github.com/saltstack/salt/issues/44290
2017-11-14 02:02:14 -05: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
Tom Williams
05c6c1016e
Merge branch 'develop' into infra5854
2017-11-13 18:53:33 -05:00
Tom Williams
1f0e9dbfb2
INFRA-5854 - implement module's return style in new func
2017-11-13 18:51:55 -05: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
Daniel Wallace
3b93ea058b
ubuntu 14 and centos 6 should not have py3 tests
2017-11-13 15:53:09 -07: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
twangboy
47114fdb30
Pass root_dirs to the win_verify_env function
...
Remove while loop that was hanging when `salt` wasn't in the path
Add salt.util.path.safe_path function to check for unsafe paths
Pass root_dir to all calls to `verify_env`
2017-11-13 13:05:23 -07: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
27a7b607b1
Merge pull request #42064 from The-Loeki/jinja_unicode
...
utils.jinja: use utils.yamldumper for safe yaml dumping
2017-11-13 12:45:13 -07:00
Mike Place
b1f14c7518
Merge pull request #43692 from cloudflare/fix-net-runner
...
Addressing a bug in the network find runner
2017-11-13 12:42:24 -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
1e94a5bd5f
Merge pull request #43689 from The-Loeki/cached_pilarenv
...
make cached pillars use pillarenv rather than saltenv
2017-11-13 12:29:59 -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
Mike Place
79b7eb1c33
Merge branch 'develop' into 43647_fix_InitiatorName_in_comments
2017-11-13 12:20:39 -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
f9b273a894
Merge pull request #43837 from twangboy/win_unit_test_archive
...
Fix `unit.states.test_archive` for Windows
2017-11-13 12:12:18 -07:00
Olivier Mauras
61f30a9d80
Correct when dict is NoneType because of the value doesn't exist
...
Example:
``` yaml
pillars:
default:
commands:
{% if grains['os'] == 'RedHat' %}
pkg_grains: /usr/bin/rpm_grains
{% endif %}
```
In this case `pkg_grains` wouldn't be found on anything else that RedHat systems and would be NoneType which would return an error and break the module.
2017-11-13 19:49:25 +01: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
Nicole Thomas
caa81728a0
Merge pull request #44507 from Ch3LL/pillar_time
...
Increase sleep timeout for pillar refresh test
2017-11-13 13:29:05 -05: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
cffea5ac71
Merge pull request #44302 from morganwillcock/badsid
...
Fix traceback and incorrect message when resolving an unresolvable SID
2017-11-13 11:19:00 -07:00
Mike Place
fef389d6ea
Merge branch 'develop' into 42713_mine.get_back_compat
2017-11-13 11:07:35 -07:00
mephi42
6e00e415d3
nova: fix endpoint URL determination in _v3_setup()
...
Some OpenStack setups return multiple entries for the same service.
This change makes the code consider all matching entries instead of
just the first one.
2017-11-13 12:55:38 -05: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
32fc952000
Merge pull request #44439 from cloudflare/fix-napalm
...
Adapt napalm modules to the new library structure
2017-11-13 10:43:23 -07:00
Mike Place
7701c299eb
Merge pull request #44455 from samodid/fix_38838
...
Fix for #38838
2017-11-13 10:40:34 -07:00
Mike Place
ebbe5949ea
Merge pull request #44457 from twangboy/win_remove_wmi_monkeypatching
...
Remove wmi monkeypatching
2017-11-13 10:38:51 -07:00
rallytime
59ddde4671
Update old util paths to new paths
2017-11-13 12:35:31 -05:00
Mike Place
366d2ccbba
Merge pull request #44472 from mephi42/develop
...
nova: fix endpoint URL determination in _v3_setup()
2017-11-13 10:32:37 -07:00
rallytime
4e2280157a
Merge branch '2017.7' into 'develop'
...
Conflicts:
- .kitchen.yml
- tests/unit/test_doc.py
- tests/unit/utils/test_cloud.py
2017-11-13 12:27:59 -05:00
Nicole Thomas
503c7276e0
Merge pull request #44276 from rallytime/salt-cli-imports
...
Change some exception imports to match the others
2017-11-13 12:23:52 -05:00
Jorge Schrauwen
f65bae8641
Merge branch 'pkgin_uptodate' of github.com:sjorge/salt into pkgin_uptodate
2017-11-13 18:22:09 +01:00
Jorge Schrauwen
57a496881e
Add versionadded where needed
2017-11-13 18:21:55 +01:00
Nicole Thomas
1da1a97d7d
Merge pull request #44490 from Ch3LL/ssh_ping
...
Enable test_deploy ssh test
2017-11-13 12:12:47 -05:00
