valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,706 Commits 24 Branches 182 Tags 341 MiB
7d385f8bdc
Commit Graph

82706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
66093738c8 Add back support for string kwargs 2017-07-21 13:50:52 -06:00
garethgreenaway
8777b1a825 Merge pull request #42466 from rallytime/bp-42452 
Back-port #42452 to 2017.7.1
 2017-07-21 12:41:23 -07:00
garethgreenaway
09521602c1 Merge pull request #42436 from garethgreenaway/42374_manage_runner_minion_offline 
Fixes to versions function in manage runner
 2017-07-21 12:41:07 -07:00
garethgreenaway
54193ea543 Merge pull request #42435 from terminalmage/issue42427 
Modify our custom YAML loader to treat unicode literals as unicode strings
 2017-07-21 12:40:34 -07:00
garethgreenaway
0b3179135c Merge pull request #42399 from rallytime/fix-42381 
Update old "ref" references to "rev" in git.detached state
 2017-07-21 12:38:58 -07:00
garethgreenaway
bd4adb483d Merge pull request #42031 from skizunov/develop3 
Fix: Reactor emits critical error
 2017-07-21 12:38:34 -07:00
garethgreenaway
3abf7ad7d7 Merge pull request #42027 from gtmanfred/2017.7 
import salt.minion for EventReturn for Windows
 2017-07-21 12:37:02 -07:00
Nicole Thomas
994d3dc74a Merge pull request #42454 from terminalmage/jinja-docs-2017.7 
Document future renaming of new rand_str jinja filter
 2017-07-21 12:47:50 -06:00
garethgreenaway
fceaaf41d0 Merge pull request #42439 from rallytime/bp-42409 
Back-port #42409 to 2017.7.1
 2017-07-21 10:38:09 -07:00
garethgreenaway
660400560b Merge pull request #42441 from rallytime/bp-42433 
Back-port #42433 to 2017.7.1
 2017-07-21 10:37:00 -07:00
Ch3LL
c10196f68c update windows urls to new py2/py3 naming scheme 2017-07-21 11:22:57 -06:00
Nicole Thomas
4480075129 Merge pull request #42452 from Ch3LL/fix_url_windows 
update windows urls to new py2/py3 naming scheme
 2017-07-21 11:20:46 -06:00
Gareth J. Greenaway
ff24102d51 Uncomment the line that removes the temporary identity file. 2017-07-21 10:01:55 -07:00
Gareth J. Greenaway
1920dc6079 Uncomment the line that removes the temporary identity file. 2017-07-21 10:00:35 -07:00
rallytime
c0df0137f5 Bump warning version from Oxygen to Fluorine in roster cache 
The change was introduced in 2017.7 - we need to provide at least
2 feature releases before removing this warning. Therefore, this
PR bumps the version we will warn until from Oxygen to Fluorine.
 2017-07-21 10:18:20 -06:00
Nicole Thomas
e2120dbd0e Merge pull request #42443 from garethgreenaway/42357_pass_args_kwargs_correctly 
[2016.11] Fix to slack engine
 2017-07-21 09:48:56 -06:00
rallytime
ea457aa0a5 Remove ALIASES block from template util 
These alias warnings were removed in #38218 for 2017.7.
 2017-07-21 09:08:26 -06:00
Nicole Thomas
8262cc9054 Merge pull request #42200 from shengis/sqlite3_fix_row_absent_2016.11 
Fix #42198
 2017-07-21 08:47:29 -06:00
Erik Johnson
98b661406e Document future renaming of new rand_str jinja filter 
The name and the documentation for this filter are entirely inaccurate
for what it actually does. It will be renamed in the Oxygen release.
 2017-07-21 09:21:38 -05:00
Ch3LL
3f4a918f73 update windows urls to new py2/py3 naming scheme 2017-07-21 09:45:30 -04:00
Gareth J. Greenaway
f411cfc2a9 Updating the slack engine in 2017.7 to pass the args and kwrags correctly to LocalClient 2017-07-20 16:57:10 -07:00
Gareth J. Greenaway
635810b3e3 Updating the slack engine in 2016.11 to pass the args and kwrags correctly to LocalClient 2017-07-20 16:50:42 -07:00
Sergey Kizunov
540977b4b1 Fix: Reactor emits critical error 
Under normal usage, the reactor will emit this critical error:

```
[CRITICAL] kwargs must be passed inside the low data within the 'kwarg'
key. See usage of salt.utils.args.parse_input() and
salt.minion.load_args_and_kwargs() elsewhere in the codebase.
 ```

It seems like only `salt.utils.reactor.Reactor` uses `salt.state.Compiler`.
Due to this, it appears safe to customize `Compiler.compile_high_data`
for usage only by the reactor. Since reactor arguments are always named,
we ensure that each 'chunk' has an `arg` field that is an empty list
and a `kwarg` field that contains all the named arguments for use
with the given function call. This conforms to the format expected by
`salt.client.mixins.SyncClientMixin._low`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2017-07-20 18:46:32 -05:00
twangboy
8176964b41 Remove build and dist, sign pkgs 2017-07-20 16:17:06 -06:00
twangboy
2c14d92a07 Fix hard coded pip path 2017-07-20 16:17:06 -06:00
twangboy
82fdd7c2e1 Add support for Py3 2017-07-20 16:17:06 -06:00
twangboy
2478447246 Update Python and other reqs 2017-07-20 16:17:06 -06:00
Mike Place
33e90be1fe Merge pull request #42411 from seedickcode/check_cmd_fix 
Fix file.managed check_cmd file not found - Issue #42404
 2017-07-20 16:59:16 -05:00
Mike Place
d9df97e5a3 Merge pull request #42424 from goten4/2016.11 
Fix error message when tornado or pycurl is not installed
 2017-07-20 16:53:40 -05:00
Mike Place
edde31376a Merge pull request #42409 from twangboy/mac_py3_scripts 
Add Scripts to build Py3 on Mac
 2017-07-20 16:36:34 -05:00
Mike Place
82982f940d Merge pull request #42433 from terminalmage/issue42403 
Only force saltenv/pillarenv to be a string when not None
 2017-07-20 16:32:23 -05:00
Gareth J. Greenaway
0fd39498c0 Updating the versions function inside the manage runner to account for when a minion is offline and we are unable to determine it's version. 2017-07-20 13:48:01 -07:00
Erik Johnson
31273c7ec1 Modify our custom YAML loader to treat unicode literals as unicode strings 2017-07-20 15:47:15 -05:00
Seth House
622ff5be40 Add LocalClient.cmd test for arg/kwarg parsing 2017-07-20 14:28:24 -06:00
Seth House
9f4eb80d90 Add a test.arg variant that cleans the pub kwargs by default 2017-07-20 14:28:24 -06:00
Erik Johnson
17f347123a Only force saltenv/pillarenv to be a string when not None 
This fixes a regression introduced to make numeric saltenv/pillarenv
work properly.
 2017-07-20 13:55:06 -05:00
twangboy
ac0e04af72 Remove build and dist, sign pkgs 2017-07-20 10:59:24 -06:00
twangboy
9d66e273c4 Fix hard coded pip path 2017-07-20 10:37:08 -06:00
rallytime
c673b64583 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - doc/conf.py
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
  - salt/engines/hipchat.py
  - salt/engines/slack.py
  - salt/grains/core.py
  - salt/version.py
  - tests/integration/states/test_renderers.py
 2017-07-20 09:54:08 -06:00
Emmanuel Bouton
1c0574d05e Fix error message when tornado or pycurl is not installed 2017-07-20 17:01:10 +02:00
Richard Clark
4ae3911f01 Fix file.managed check_cmd file not found - Issue #42404 2017-07-19 20:30:49 -07:00
Nicole Thomas
a71938cefe Merge pull request #42408 from CorvinM/file-replace-doc-fix 
Fix documentation misformat in salt.states.file.replace
 2017-07-19 18:45:42 -06:00
twangboy
7b8d6cbbd2 Add support for Py3 2017-07-19 17:30:47 -06:00
Corvin Mcpherson
246a2b3e74 Fix documentation misformat in salt.states.file.replace 2017-07-19 19:29:20 -04:00
rallytime
d9d94fe02f Update old "ref" references to "rev" in git.detached state 
Fixes #42381

The "rev" kwarg was added to replace "ref" in #38898, however,
when switching the state over to "rev", some stacktraces occur
due to some remaining "ref" references.
 2017-07-19 13:29:42 -06:00
twangboy
aa4eed93c8 Update Python and other reqs 2017-07-19 11:22:07 -06:00
Mike Place
42bb1a64ca Merge pull request #42350 from twangboy/win_fix_ver_grains_2016.11 
Fixes problem with Version and OS Release related grains on certain versions of Python (2016.11)
 2017-07-19 12:07:25 -05:00
Mike Place
d385dfd19d Merge pull request #42347 from twangboy/win_fix_ver_grains 
Fixes problem with Version and OS Release related grains on certain versions of Python
 2017-07-19 12:05:43 -05:00
Mike Place
0a72e56f6b Merge pull request #42356 from meaksh/2016.11-AliasesLoader-wrapper-fix 
Allow to check whether a function is available on the AliasesLoader wrapper
 2017-07-19 11:56:41 -05:00
Mike Place
10eb7b7a79 Merge pull request #42368 from twangboy/win_fix_build_2016.11 
Remove build and dist directories before install (2016.11)
 2017-07-19 11:47:27 -05:00