valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
80,354 Commits 24 Branches 182 Tags 341 MiB
9cf1b37b54
Commit Graph

80354 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ch3LL
89d1f3943d remove unnecessary try blocks 2017-03-31 09:46:34 -06:00
Nicole Thomas
43066f3c67 Merge pull request #40364 from basepi/worker_threads 
Remove usually-wrong advice to raise worker threads
 2017-03-31 09:33:44 -06:00
Nicole Thomas
52ac869c68 Merge pull request #40370 from nmadhok/develop-fix-38370 
Fix vmware cloud driver issue when Required field deviceChange not provided (not @optional)
 2017-03-31 09:32:58 -06:00
Nicole Thomas
3d6d6de190 Merge pull request #40405 from twangboy/fix_win_file 
Add missing import to win_file, remove missing tests from whitelist
 2017-03-31 09:31:57 -06:00
Mike Place
5fff321468 Merge pull request #40422 from github-abcde/loader_allow-partials 
salt/loader.py: Allow functools.partial functions to be loaded from m…
 2017-03-31 09:25:26 -06:00
Nicole Thomas
864193e143 Merge pull request #40440 from cachedout/beacon_warning 
Display warning when beacon is not available
 2017-03-31 09:12:12 -06:00
Nicole Thomas
5f2a19470f Merge pull request #40385 from stefan-walluhn/develop 
Fix 'clean_pub_auth' maintenance job
 2017-03-31 09:03:14 -06:00
Nicole Thomas
1e082025e0 Merge pull request #40448 from Juniper/develop 
Correct the junos unit tests which mock getattr
 2017-03-31 08:58:22 -06:00
Owen Synge
71a69c0f41 Minion:Salt master can be a list or a string 
When you configure the salt minion you can set a single salt master, or a list
of salt masters. When using a function to provide the salt master it should not
be any different.

Signed-off-by: Owen Synge <osynge@googlemail.com>
 2017-03-31 15:34:42 +02:00
rajvidhimar
8d83d482c5 Correct the junos unit tests which mock getattr 2017-03-31 16:19:21 +05:30
Pedro Algarvio
8617be9c6d Merge pull request #40443 from gtmanfred/sshlog 
prepend ssh_log_file with root_dir
 2017-03-31 10:23:45 +01:00
Mike Place
4d0a011074 Merge pull request #40363 from sergeizv/optimize-if-statement 
Optimize if statement
 2017-03-30 16:43:01 -06:00
Mike Place
132d8b7b88 Merge pull request #40376 from nmadhok/2016.11 
Backporting changes in vmware cloud driver from develop branch to 2016.11 branch
 2017-03-30 16:35:12 -06:00
Mike Place
1e47120cbb Merge pull request #40381 from terminalmage/issue40355 
Support defining nodegroups as a dictlist as well as a dict
 2017-03-30 16:31:12 -06:00
Mike Place
dfaa670b66 Merge pull request #40387 from redbaron4/fix-39692 
More complete fix for 39692
 2017-03-30 16:29:05 -06:00
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