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
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
Mircea Ulinic
da2611c27d
Fix out module doc
2017-11-14 12:34:32 +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
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
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
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
18624d6798
Merge pull request #44491 from Ch3LL/ssh_raw
...
Add salt-ssh raw integration tests
2017-11-13 10:47:11 -05:00
Nicole Thomas
aa17bfa8e7
Merge pull request #44492 from twangboy/win_skip_mode_check
...
Fix `unit.utils.test_cloud` for Windows
2017-11-13 10:44:30 -05: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
twangboy
2f30ad93b1
Skips mode check in Windows
2017-11-10 14:29:10 -07:00
Ch3LL
3dc8673417
change class name to raw
2017-11-10 14:47:42 -05:00
Ch3LL
308596ac8d
Add salt-ssh raw integration tests
2017-11-10 14:47:38 -05: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
5b95495e75
Merge pull request #44484 from Ch3LL/orch_test
...
Add orchestration tests when target exists or not
2017-11-10 12:24:21 -07: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
Nicole Thomas
62c42ca6fb
Merge pull request #44480 from Ch3LL/override_pillar
...
Add integration pillar command line test
2017-11-10 12:14:31 -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
