Commit Graph

86190 Commits

Author SHA1 Message Date
Mike Place
5531e2f738 Merge pull request #43489 from garethgreenaway/41510_mount_opts
Fix to mount state when options are removed
2017-09-19 18:10:47 -06:00
Mike Place
8e66086c78 Merge pull request #43346 from kunal-bajpai/fix_cb_returner
Fix save_load to add doc if not exists
2017-09-19 17:34:53 -06:00
Mike Place
6d830d6ec8 Merge pull request #43510 from alexbleotu/list_cluster-gh
vsphere.list_cluster and dependencies
2017-09-19 17:18:20 -06:00
Daniel Wallace
f84b50a06b
results and columns are lists for mysql returns 2017-09-19 15:08:17 -06:00
Daniel Wallace
afaf76d0ba
add release note 2017-09-19 12:50:50 -06:00
Daniel Wallace
3bae894306
digitalocean should be one word.
Everything on their webpage is a reference to DigitalOcean
2017-09-19 12:47:16 -06:00
garethgreenaway
89f629233f Merge pull request #43585 from rallytime/bp-43330
Back-port #43330 to 2017.7.2
2017-09-19 10:33:33 -07:00
Mike Place
1bda4832ef Merge pull request #43587 from rallytime/fix-virtual
Add reason to linux_acl state loading failure
2017-09-19 10:26:50 -06:00
Mike Place
91fd112e5c Remove trailing whitespace 2017-09-19 10:17:05 -06:00
garethgreenaway
c4f693bae8 Merge branch '2017.7.2' into bp-43330 2017-09-19 08:36:43 -07:00
garethgreenaway
abb7fe4422 Merge pull request #43586 from rallytime/bp-43526
Back-port #43526 to 2017.7.2
2017-09-19 08:36:26 -07:00
Petr Michalec
3373d25f94 Merge branch 'develop' into fix-nacl-decrypt 2017-09-19 15:48:41 +02:00
Petr Michalec
ad05cc5d98
Fix names of NACL dec. methods 2017-09-19 15:46:12 +02:00
vnitinv
67aea63be9 Merge remote-tracking branch 'upstream/develop' into develop 2017-09-19 15:37:27 +05:30
Vladimir Nadvornik
2d810690b6 Fix pylint errors 2017-09-19 11:01:27 +02:00
Jochen Breuer
d1b5ec098c Merge branch '2017.7' into improve-async-operation-handling-in-kubernetes-module 2017-09-19 10:44:31 +02:00
Jochen Breuer
35cf69bc50
Moved exception Salt core
The timeout exception is now part of exceptions.py and no longer solely
defined in the module.
2017-09-19 10:43:01 +02:00
Nicole Thomas
054f7c9551 Merge pull request #43559 from sdodsley/purefa_doc_fix
Fix documentation to state correct module name [purefa]
2017-09-18 16:56:25 -04:00
Nicole Thomas
c682f86e38 Lint: Add empty line at end of file 2017-09-18 16:54:04 -04:00
Simon Dodsley
35d18cd05a Fix documentation to state correct module name 2017-09-18 13:46:21 -07:00
garethgreenaway
562c9e2415 Merge branch 'develop' into 41510_mount_opts 2017-09-18 13:42:48 -07:00
garethgreenaway
2e19533e3c Merge pull request #43584 from cachedout/engines_doc_clarification
Enhance engines docs
2017-09-18 13:40:56 -07:00
Nicole Thomas
7f59119f95 Merge branch '2017.7' into win_fix_pkg.install 2017-09-18 16:39:09 -04:00
Nicole Thomas
50b134ef4c Merge pull request #43519 from terminalmage/fix-aptpkg
Fix incorrect handling of pkg virtual and os_family grain
2017-09-18 16:35:00 -04:00
Nicole Thomas
dd953f36ae Merge pull request #43520 from clan/acl
_search_name is '' if acl type is other
2017-09-18 16:33:50 -04:00
Nicole Thomas
f32e838726 Merge pull request #43573 from theredcat/develop
Add an option to check & update elasticsearch template
2017-09-18 16:31:21 -04:00
Nicole Thomas
ad9663a7fc Merge pull request #43561 from wedge-jarrad/selinux-doc-cleanup
Clean up doc formatting in selinux state & module
2017-09-18 16:28:46 -04:00
rallytime
e5297e3869 Add reason to linux_acl state loading failure 2017-09-18 16:19:15 -04:00
Nicole Thomas
cc3d9c1a01 Merge pull request #43580 from garethgreenaway/43560_update_linux_acl_documentation
Updating ACL module and state module documentation
2017-09-18 16:11:25 -04:00
Dmitry Kuzmenko
e076e9b634 Forward events to all masters syndic connected to. 2017-09-18 16:08:57 -04:00
Erik Johnson
7abd07fa07 Simplify client logic 2017-09-18 16:07:36 -04:00
Erik Johnson
b5f10696c2 Improve the reactor documentation
This reorganizes the reactor docs and includes examples of the new
reactor SLS config syntax.
2017-09-18 16:07:36 -04:00
Erik Johnson
7a2f12b96a Include a better example for reactor in master conf file 2017-09-18 16:07:36 -04:00
Erik Johnson
531cac610e Rewrite the reactor unit tests
These have been skipped for a while now because they didn't work
correctly. The old tests have been scrapped in favor of new ones that
test both the old and new config schema.
2017-09-18 16:07:36 -04:00
Erik Johnson
2a35ab7f39 Unify reactor configuration, fix caller reactors
There are 4 types of reactor jobs, and 3 different config schemas for
passing arguments:

1. local - positional and keyword args passed in arg/kwarg params,
   respectively.
2. runner/wheel - passed as individual params directly under the
   function name.
3. caller - only positional args supported, passed under an "args"
   param.

In addition to being wildly inconsistent, there are several problems
with each of the above approaches:

- For local jobs, having to know which are positional and keyword
  arguments is not user-friendly.
- For runner/wheel jobs, the fact that the arguments are all passed in
  the level directly below the function name means that they are dumped
  directly into the low chunk. This means that if any arguments are
  passed which conflict with the reserved keywords in the low chunk
  (name, order, etc.), they will override their counterparts in the low
  chunk, which may make the Reactor behave unpredictably.

To solve these issues, this commit makes the following changes:

1. A new, unified configuration schema has been added, so that arguments
   are passed identically across all types of reactions. In this new
   schema, all arguments are passed as named arguments underneath an
   "args" parameter. Those named arguments are then passed as keyword
   arguments to the desired function. This works even for positional
   arguments because Python will automagically pass a keyword argument
   as its positional counterpart when the name of a positional argument
   is found in the kwargs.
2. The caller jobs now support both positional and keyword arguments.

Backward-compatibility with the old configuration schema has been
preserved, so old Reactor SLS files do not break. In addition, you've
probably already said to yourself "Hey, caller jobs were _already_
passing their arguments under an "args" param. What gives?" Well, using
the old config schema, only positional arguments were supported. So if
we detect a list of positional arguments, we treat the input as
positional arguments (i.e. old schema), while if the input is a
dictionary (or "dictlist"), we treat the input as kwargs (i.e. new
schema).
2017-09-18 16:07:36 -04:00
Erik Johnson
4afb179bad Un-deprecate passing kwargs outside of 'kwarg' param 2017-09-18 16:07:36 -04:00
garethgreenaway
634536b0ff Merge branch '2017.7' into engines_doc_clarification 2017-09-18 13:07:17 -07:00
garethgreenaway
e04acb6216 Merge branch '2017.7' into win_fix_chocolatey 2017-09-18 13:05:46 -07:00
Mike Place
1a619708c1 Enhance engines docs
Add a note about formatting to make it more clear.
2017-09-18 13:44:44 -06:00
Mike Place
3d3b09302d Merge pull request #43551 from twangboy/osx_fix_preinstall_2017.7.2
Fix preinstall script on OSX for 2017.7.2
2017-09-18 12:35:34 -06:00
garethgreenaway
26d33fe64c Merge branch 'develop' into 41510_mount_opts 2017-09-18 11:14:55 -07:00
garethgreenaway
e63fae4c91 Merge branch '2017.7' into 43560_update_linux_acl_documentation 2017-09-18 11:12:37 -07:00
Gareth J. Greenaway
117a0ddbbc Updating the documentation to call out the requirement for the getfacl and setfacl binaries 2017-09-18 11:09:36 -07:00
Mike Place
bf7b23316f Merge pull request #43523 from skizunov/develop2
Add back lost logic for multifunc_ordered
2017-09-18 11:46:15 -06:00
garethgreenaway
ed8f6ed353 Merge branch 'develop' into comspec 2017-09-18 10:33:05 -07:00
garethgreenaway
431484f9c8 Merge pull request #43339 from cloudflare/napalm-beacon
Adding the first napalm beacon
2017-09-18 10:31:46 -07:00
Mike Place
e29efecf4f Merge pull request #43526 from DSRCorporation/bugs/43447_syndic_events_forwarding
Forward events to all masters syndic connected to
2017-09-18 10:54:45 -06:00
Mike Place
56b671e087 Merge pull request #43330 from terminalmage/issue43077
Fix reactor regression + unify reactor config schema
2017-09-18 10:46:10 -06:00
spenceation
ac7e81b6e3 - Added support to parse XML ElementTrees with attributes. 2017-09-18 11:50:17 -04:00
Sergey Kizunov
fb579321a9 Add back lost logic for multifunc_ordered
PR #38168 was merged but some of the merged logic was subseqently lost.
Add back the lost logic so that the feature may work again.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-09-18 10:19:52 -05:00