Mike Place
bb9eaeb012
Merge pull request #40392 from holmboe/digitalocean-ssh-interface
...
Simplify logic in Digital Ocean ssh_interface tags
2017-03-30 16:28:15 -06:00
Mike Place
313d21626f
Merge pull request #40404 from roaldnefs/fix-djangomod-loaddata
...
Fix for fixtures in the djangomod module
2017-03-30 16:26:08 -06:00
Mike Place
9f7b7cede0
Merge pull request #40406 from twangboy/fix_test_pydsl
...
Fix RuntimeError in state.py
2017-03-30 16:25:20 -06:00
Mike Place
0ce70dcb29
Merge pull request #40412 from do3meli/patch-3
...
corrected documentation typo in acme state
2017-03-30 16:24:20 -06:00
Mike Place
d22af34b7e
Merge pull request #40415 from defanator/boto_vpc_create_route_fix
...
Fix boto_vpc.create_route() to work with interface_id
2017-03-30 16:23:44 -06:00
Mike Place
5379899442
Merge pull request #40416 from lorengordon/win-file-funcs
...
Adds some missing file functions on Windows
2017-03-30 16:22:43 -06:00
Mike Place
1f5d6b88f9
Merge pull request #40418 from lorengordon/close-temp-file
...
Closes handle to temporary file before returning the path
2017-03-30 16:22:02 -06:00
Mike Place
3c108bd95b
Merge pull request #40421 from irtnog/fix-win_useradd-info-return
...
Return the same value for a non-existent user as on other platforms.
2017-03-30 16:13:57 -06:00
Mike Place
5c78d55eab
Merge pull request #40430 from twangboy/fix_virtual
...
Fix logic for __virtual__ in win_dsc and win_psget
2017-03-30 16:06:15 -06:00
Nicole Thomas
fbbe0127f5
Merge pull request #40432 from rallytime/merge-develop
...
[develop] Merge forward from 2016.11 to develop
2017-03-30 15:57:57 -06:00
Ch3LL
5cd34a9083
finish the tests
2017-03-30 15:57:53 -06:00
Mike Place
56b31cf458
Display warning when beacon is not available
...
This will prevent a beacon which doesn't have the required libs
available from just silently refusing to run.
2017-03-30 15:56:18 -06:00
Daniel Wallace
7f6046deec
prepend ssh_log_file with root_dir
2017-03-30 16:55:15 -05:00
Mike Place
b855f29928
Merge pull request #40431 from rallytime/merge-2016.11
...
[2016.11] Merge forward from 2016.3 to 2016.11
2017-03-30 15:37:39 -06:00
Mike Place
9d19bb635c
Merge pull request #40428 from rallytime/statemod-test-fix
...
Update mocking for unit.test_statemod tests
2017-03-30 15:37:10 -06:00
Mike Place
c510db4a7f
Merge pull request #40426 from rallytime/reactor-flaky-decorator
...
Add the @flaky decorator to the reactor integration test
2017-03-30 15:01:26 -06:00
Mike Place
b62c8c2965
Merge pull request #40414 from chaseadamsio/develop
...
docs: fix typo in states/index.rst
2017-03-30 15:00:38 -06:00
Mike Place
2f4b3060e9
Merge pull request #40409 from q1x/develop
...
Corrected comment typo
2017-03-30 15:00:08 -06:00
Mike Place
cfffb53574
Merge pull request #40356 from mchugh19/develop
...
Initial support for sending message cards to Microsoft Teams
2017-03-30 14:59:21 -06:00
Roald Nefs
92285cb045
Fix for fixtures in the djangomod module
...
Fixes #7287
2017-03-30 22:13:21 +02:00
Lukas Raska
24cc9b2a0c
[WIP] Refactor Elasticsearch execution and state modules ( #40192 )
...
* Add Ingest pipeline methods to Elasticsearch execution module
* Refactor Elasticsearch execution module and properly handle exceptions
* Throw CommandExecutionError in methods applicable for different Elasticsearch versions
* Refactor Elasticsearch states to reflect execution module changes
* Add state for managing Elasticsearch pipelines
* Fix few typos in Elasticsearch module, return None when deleted document doesn't exist
* Implements stats and health methods for Elasticsearch
* Add Elasticsearch methods to open/close index, manage search templates and repositories
* Merge existing Elasticsearch states into single one, add Search Template handling
* Add index alias state for Elasticsearch, fix documentation
* Catch all global exceptions in Elasticsearch states, unit test all of them
* Implement few Unit tests for Elasticsearch execution module, merge fixes into deprecated elastic states
* Implement additional unit tests for Elasticsearch execution module
* Finalize Elasticsearch module documentation
2017-03-30 13:22:58 -06:00
rallytime
1792acedc0
Merge branch '2016.11' into 'develop'
...
Conflicts:
- salt/template.py
- tests/unit/modules/dockerng_test.py
2017-03-30 12:32:24 -06:00
rallytime
d5576d75e7
Merge branch '2016.3' into '2016.11'
...
Conflicts:
- salt/crypt.py
2017-03-30 12:21:44 -06:00
twangboy
08e95ce4f0
Add logging on __virtual__ failures
2017-03-30 12:01:55 -06:00
Nicole Thomas
b6770fd81f
Merge pull request #40407 from aesdana/fix_rabbitmq_version_check
...
Added split to cut off debian_revision from rabbitmq-server version
2017-03-30 11:53:03 -06:00
Nicole Thomas
d4fb45d9f8
Merge pull request #40424 from terminalmage/fix-open-filehandle
...
Fix open filehandles
2017-03-30 11:51:20 -06:00
twangboy
43ecb1a597
Fix logic for __virtual__
2017-03-30 11:43:18 -06:00
rallytime
ebfc7b98ef
Update mocking for unit.test_statemod tests
2017-03-30 11:10:01 -06:00
rallytime
607f3e53e8
Add the @flaky decorator to the reactor integration test
...
This test occassionally fails on the develop branch and I cannot
reproduce it. @cachedout recommended to add the flaky decorator
to the test until we can circle back around and look at this more
closely.
2017-03-30 10:42:26 -06:00
Nicole Thomas
de3d58574a
Merge pull request #40425 from rallytime/skip-junos-tests
...
Skip 2 junos module unit tests: "salt.modules.junos.getattr" patch stacktraces
2017-03-30 10:24:44 -06:00
Erik Johnson
66251263cf
Fix open filehandles
...
This fixes two cases of filehandles being left open by failing to use a
with clause.
2017-03-30 11:10:43 -05:00
rallytime
762e08634a
Skip 2 junos module unit tests: "salt.modules.junos.getattr" patch stacktraces
2017-03-30 10:10:16 -06:00
herbert.buurman
a316f50136
salt/loader.py: Allow functools.partial functions to be loaded from modules.
2017-03-30 17:12:23 +02:00
Matthew X. Economou
ba3cfe3873
Return the same value for a non-existent user as on other platforms.
...
Fixes #40419 .
2017-03-30 11:04:20 -04:00
Loren Gordon
7baf2809cf
Closes handle to temporary file before returning the path
...
Fixes #40417
2017-03-30 10:29:06 -04:00
Loren Gordon
8edaf25e10
Adds some missing file functions on Windows
2017-03-30 09:38:00 -04:00
Andrei Belov
1afdc3ac77
Fix boto_vpc.create_route() to work with interface_id
...
Seems like it was broken in 4611a9c5
2017-03-30 15:49:34 +03:00
Chase Adams
f2d855bfbf
docs: fix typo in states/index.rst
2017-03-30 04:41:04 -07:00
Chase Adams
b9982e3884
docs: fix typo in states/index.rst
2017-03-30 04:29:31 -07:00
do3meli
5d9b22adae
corrected documentation typo in acme state
2017-03-30 11:01:23 +02:00
Christian McHugh
48032a240e
correct lint errors
2017-03-30 07:44:34 +01:00
Raymond Kuiper
3a686d6d92
Corrected comment typo
2017-03-30 08:06:18 +02:00
Dheeraj
77a40a0c44
Lint fixes
2017-03-30 10:31:16 +05:30
Dheeraj
8c1adfafd5
More complete fix for 39692
...
The existing fix did not work if the profile name itself had a dash `-`.
For example - `virtual-guest`. This commit fixes that by using `split('- ')`
rather than `split('-')`. This commit also provides two simple tests for the
`list_()` function to emulate behaviour of both old and new tuned-adm versions
Fixes #39692
2017-03-30 10:31:16 +05:30
Nitin Madhok
dd62310941
Adding unit tests for vmware_test
2017-03-30 00:54:57 -04:00
Nitin Madhok
36edf0af64
Add additional VMware related exceptions
2017-03-30 00:54:31 -04:00
Nitin Madhok
034ef30f7c
Remove old vmware unit tests
2017-03-30 00:53:09 -04:00
Ch3LL
aa95b99608
add snapshot and fix instance test
2017-03-29 17:41:47 -06:00
Nicole Thomas
d3633cf8a2
Merge pull request #40357 from sergeizv/check-has-win32
...
Check salt.utils.win_functions.HAS_WIN32 in salt.utils.get_user
2017-03-29 17:11:45 -06:00
Elena Konoreva
4c0763fa2f
Added split to cut off debian_revision from rabbitmq-server version
...
Fixes #40396
2017-03-30 02:10:40 +03:00
