valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
71,908 Commits 24 Branches 182 Tags 341 MiB
17a230a2e5
Commit Graph

71908 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
a5d539a218 Fix hardcoded seperator 2016-07-27 15:43:27 -07:00
twangboy
d409a51bec Add missing state file for windows 2016-07-27 15:23:51 -07:00
twangboy
55cb909f68 Fix two more tests for Windows 2016-07-27 15:17:36 -07:00
Nicole Thomas
f830605f20 Merge pull request #35001 from techhat/azurewarn 
Change an exception to a warning
 2016-07-27 15:56:40 -06:00
Elias Probst
32d0f392da modules.slack.post_message: Allow sending messages to direct-message channels (name starting with @) (#34983) 2016-07-27 15:20:24 -06:00
Nicole Thomas
b089db6f21 Fix pylint of develop (#35002) 2016-07-27 15:18:29 -06:00
Joseph Hall
5bb614269c Change an exception to a warning 2016-07-27 14:10:57 -06:00
Mike Place
660dc92cf8 [RFC] Only check minions that are missing (#34917) 
Right now, we all ask minions for a job, regardless of whether or not
we expected them to return a job. This changes that behavior so that
we now only ask the minions that we expected to return but did not.

Questions: Will this have bad side-effects for syndics or multi-master?

Or, are the valid use cases for a minion returning a result that we weren't expecting?
 2016-07-27 13:21:39 -06:00
Mike Place
b964d1b006 Merge pull request #34999 from cachedout/fixup_33875 
Fixup #33875
 2016-07-27 13:18:34 -06:00
Mike Place
48aa151fa6 Fixup #33875 2016-07-27 13:17:57 -06:00
Mike Place
7956dbe568 Merge pull request #33875 from sangoma/correct_map_diff 
Fix naive fileserver map diff algorithm
 2016-07-27 13:14:49 -06:00
Mike Place
92e69310c9 Merge pull request #34993 from terminalmage/docs 
Add docs on utility modules, improve module writing docs, update Carbon release notes
 2016-07-27 13:12:30 -06:00
Mike Place
aae430d8c1 Merge pull request #34977 from terminalmage/zd868 
Add jid to return from runner/wheel funcs executed within orchestration
 2016-07-27 13:10:57 -06:00
Mike Place
05cfb1cefc Merge pull request #34996 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-07-27 13:03:04 -06:00
Mike Place
bd995c014d Merge pull request #34997 from saltstack/revert-34990-decode-bytes-integration-init 
Revert "Decode byte strings when running tests in Python 3"
 2016-07-27 13:00:57 -06:00
Nicole Thomas
a5582d0535 Revert "Decode byte strings when running tests in Python 3" 2016-07-27 13:00:01 -06:00
twangboy
3da842cea3 Put import in the right place 2016-07-27 11:21:20 -07:00
twangboy
e74fd599ce Add missing import salt.utils.win_functions 2016-07-27 11:17:16 -07:00
Mike Place
b424f5cec6 Merge pull request #34875 from oms4suse/wip_add_ceph 
Wip add ceph
 2016-07-27 12:07:14 -06:00
Mike Place
1534b143e2 Merge pull request #34772 from kerick/ddns-port-work 
ddns: Add support for user defined nameserver port/TSIG key algorithm
 2016-07-27 12:05:40 -06:00
Erik Johnson
c3f9e13fbe Update unit tests to reflect new behavior of WheelClient/RunnerClient 2016-07-27 13:01:24 -05:00
rallytime
a7d4f93697 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/integration/__init__.py
 2016-07-27 11:35:16 -06:00
Mike Place
2a0255fb0a Lint postgres returner (#34995) 
Refs #34476
 2016-07-27 11:33:08 -06:00
Elias Probst
d96386d162 salt.states.slack: check correct result attribute (#34987) 
* The Slack execution module doesn't simply return a boolean to indicate
success/failure, but returns `True` in case of success and a dictionary
in case of failure which contains a `res` (boolean) and `message`.

This addresses the varying types returned by the execution module and
properly handles failure cases now instead of simply indicating success
on state execution.

Even before 69afcc4 only `result` was checked, but not its `res`
attribute.

Signed-off-by: Elias Probst <elias@grammofy.com>

* Consistent error msg formatting

Signed-off-by: Elias Probst <elias@grammofy.com>
 2016-07-27 11:32:12 -06:00
Mike Place
e28d2bc5ed Merge pull request #34476 from kriberg/update-postgres-returner 
Updated postgres returner to support new API
 2016-07-27 11:29:25 -06:00
Mike Place
edeb0eda36 Merge pull request #34835 from thatch45/34526_ 
Make the mine and publish combine minion and master opts in salt-ssh
 2016-07-27 11:25:26 -06:00
Mike Place
b58c663d8d Merge pull request #34991 from cachedout/ssh_timeout 
SSH timeout
 2016-07-27 11:24:37 -06:00
Mike Place
1067c17095 Merge pull request #34826 from rallytime/unit-module-py3-tests 
Python 3 compatibility fixes (execution module unit tests)
 2016-07-27 11:24:00 -06:00
Mike Place
eb8ffab057 Merge pull request #34857 from eradman/blockreplace 
Preserve ownership for blockreplace backup files
 2016-07-27 11:21:36 -06:00
Erik Johnson
82ebfc6b31 Improve Carbon release docs 2016-07-27 12:15:28 -05:00
Mike Place
5f8370ae8d Refine errors in client (#34976) 
* Refine errors in client

Check for the existence of cache data

* Adjust tests for new return string
 2016-07-27 11:05:31 -06:00
Mike Place
3c76214f99 Merge pull request #34990 from rallytime/decode-bytes-integration-init 
Decode byte strings when running tests in Python 3
 2016-07-27 11:02:12 -06:00
Erik Johnson
0633275427 Remove unnecessary double-asterisk from docstring 2016-07-27 11:58:36 -05:00
Erik Johnson
6ae5667c23 Clarify usage of module.run state in states documentation 2016-07-27 11:57:55 -05:00
Erik Johnson
a5c78d626e Improve accuracy and formatting of execution module docs 2016-07-27 11:57:12 -05:00
Erik Johnson
4538b9e9d4 Add utility modules doc page to the TOC 2016-07-27 11:56:49 -05:00
Erik Johnson
4e804217e3 Add documentation on utility modules 2016-07-27 11:56:41 -05:00
Mike Place
39cd8da399 Lint diff against salt-testing 2016-07-27 10:42:44 -06:00
Fred Damstra
ca098c8929 Removed unnecessary debug loglevel check 2016-07-27 12:40:47 -04:00
Mike Place
443e5cdde2 Add timeout to ssh tests 2016-07-27 10:40:02 -06:00
rallytime
83d3ac4771 Decode byte strings when running tests in Python 3 2016-07-27 10:34:34 -06:00
Nicole Thomas
721e6dcce8 Merge pull request #34988 from rallytime/release-notes-update 
Update release notes with new changes
 2016-07-27 09:54:15 -06:00
rallytime
a2aae987a6 Update release notes with new changes 2016-07-27 09:53:19 -06:00
Fred Damstra
aff8347eb5 Incorporated Erik Johnson's suggestions. 2016-07-27 11:44:43 -04:00
Fred Damstra
8b56d76490 Adds support for multiple server-side event_returners. 
The master config 'event_return' can now take a list
of returners which will each be called in turn. It
continues to function with the previous configuration
format of a single item.
 2016-07-27 11:41:59 -04:00
Mike Place
a988d42209 Merge pull request #34936 from bebehei/bashcompletion-cache 
Bash-completion cache output and improve behavior
 2016-07-27 09:00:03 -06:00
Mike Place
28268208f9 Merge pull request #34937 from twangboy/int_tests_cp 
Fix test_list_minion for Windows
 2016-07-27 08:53:45 -06:00
Mike Place
847d8ea95f Merge pull request #34939 from twangboy/int_tests_git 
Fix git integration tests for Windows
 2016-07-27 08:44:35 -06:00
Mike Place
d63ac1671c Merge pull request #34946 from alprs/fix-venv_reqs_subdir 
Fix virtualenv behavior when requirements files are in subdirectories
 2016-07-27 08:43:27 -06:00
Mike Place
ed65a27377 Merge pull request #34965 from xlotlu/patch-1 
grafana_datasource: fix missing name in state return
 2016-07-27 08:37:56 -06:00