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
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
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
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
Gareth J. Greenaway
45c9a233dc
Merge branch 'develop' into req_any
2017-11-13 09:16:56 -07:00
zbroch
c52bc23724
Add priority field to support the latest capirca.
2017-11-13 17:06:07 +01:00
zbroch
b72456eb5e
Add priority field to support the latest capirca.
2017-11-13 16:54:42 +01:00
Nicole Thomas
f4757ca36b
Merge pull request #44502 from sjorge/PR43996
...
Additional comments required for PR #43996
2017-11-13 10:37:21 -05:00
Jorge Schrauwen
25b3c0bd15
Add the missing versionchanged info.
2017-11-12 20:38:08 +01:00
angeloudy
1b5a3a613c
Update zfs.py
2017-11-12 20:36:26 +01:00
Mike Place
bca50dedb0
Merge pull request #44361 from isbm/isbm-file.line-issues-devel
...
Long-awaiting set of unit tests and fixes for "file.line"
2017-11-10 16:37:56 -07:00
mephi42
1f3c4a3cac
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-10 20:38:43 +01:00
Nicole Thomas
18ac000e15
Merge pull request #44482 from gtmanfred/develop
...
update kitchen yaml to use master for salt-jenkins
2017-11-10 12:16:30 -07:00
Nicole Thomas
0c4bb0b7e0
Merge pull request #44486 from vitaliyf/patch-1
...
Fixed minor spelling mistake.
2017-11-10 12:15:53 -07:00
Mike Place
8391b34372
Merge pull request #44148 from roaldnefs/add-telegram-returner
...
Add Telegram returner
2017-11-10 12:04:30 -07:00
Bo Maryniuk
8873a925aa
Add root-level documentation to the module
2017-11-10 20:02:04 +01:00
Bo Maryniuk
f741bb01ec
Add timeout option, default to 20 minutes
2017-11-10 20:02:04 +01:00
Bo Maryniuk
8e64f1b67b
Use timed subprocess for bailing out on hanging situation
2017-11-10 20:02:04 +01:00
Bo Maryniuk
c7d49cb893
Add more descriptive function name
2017-11-10 20:02:04 +01:00
Bo Maryniuk
f8c016cd48
Remove extra assertions
2017-11-10 20:02:04 +01:00
Bo Maryniuk
755bc35585
Fix value is not iterable error
2017-11-10 20:02:04 +01:00
Bo Maryniuk
56c52e6ab3
Fix TypeError for argument of type 'LoaderError' is not iterable
2017-11-10 20:02:04 +01:00
Bo Maryniuk
66ab163e40
Lintfix: W0602
2017-11-10 20:02:04 +01:00
Bo Maryniuk
d047270a0d
Lintfix: E8701 (PEP8 E701), C0321
2017-11-10 20:02:04 +01:00
Bo Maryniuk
58aa4a0f23
Lintfix: W0611
2017-11-10 20:02:04 +01:00
Bo Maryniuk
bb13d001ce
Lintfix: W0108
2017-11-10 20:02:04 +01:00
Bo Maryniuk
8f7ef4f45f
Lintfix: E9502
2017-11-10 20:02:04 +01:00
Bo Maryniuk
0594517a2e
Lintfix: E0102
2017-11-10 20:02:04 +01:00
Bo Maryniuk
64d3c1e300
Lintfix: W1699
2017-11-10 20:02:04 +01:00
Bo Maryniuk
7742037bcd
Don't bother with non-pytest unit tests
2017-11-10 20:02:04 +01:00
Bo Maryniuk
67cede713f
Add unit test for module loader failure
2017-11-10 20:02:04 +01:00
Bo Maryniuk
4004e2f53d
Add unit test for module loader
2017-11-10 20:02:04 +01:00
Bo Maryniuk
fd2fca0482
Improve module loader failure
2017-11-10 20:02:04 +01:00
Bo Maryniuk
25990f66bc
Add unit test resolver module loader failure
2017-11-10 20:02:04 +01:00
Bo Maryniuk
9d0762a8ee
Refactor to setup/teardown methods
2017-11-10 20:02:04 +01:00
Bo Maryniuk
630b654544
Add unit test for modules filtering
2017-11-10 20:02:04 +01:00
Bo Maryniuk
fc24371704
Do not use mock but real resolver class
2017-11-10 20:02:04 +01:00
Bo Maryniuk
082d47f2c1
Add unit test for documentation extractor
2017-11-10 20:02:04 +01:00
Bo Maryniuk
c7a1b733ab
Add scaffold for the unit test
2017-11-10 20:02:04 +01:00
Bo Maryniuk
372c0f642e
Add the license header
2017-11-10 20:02:04 +01:00
Bo Maryniuk
7239180c82
Mimic the direct call of the module to reuse internal arg parsing
2017-11-10 20:02:04 +01:00
