valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,204 Commits 24 Branches 182 Tags 341 MiB
aef4978a6f
Commit Graph

67204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
b2637fbb02 Use clean_kwargs and invalid_kwargs utils funcs to handle invalid kwargs 2016-02-29 20:38:02 -06:00
kstreee
1c9e05249f [saltstack/salt#31534] Resolve data['arg'] type issue. Now rest_tornado can accept not only a list of string type for 'arg', but also a string type data for 'arg'. 2016-03-01 01:53:30 +00:00
twangboy
1f6a95694d Grant permissions using SID instead of name 2016-02-29 18:09:31 -07:00
Borys Pierov
79d7e7059c Use YAML to parse values in Consul pillar 2016-02-29 16:28:15 -05:00
justinta89
196dd4db99 Skipped test 2016-02-29 14:21:19 -07:00
Nicole Thomas
658c1865ab Merge pull request #31550 from rallytime/win_service-docs 
Correct versionadded tag for win_service.config
 2016-02-29 14:11:24 -07:00
Nicole Thomas
3cd31b0917 Merge pull request #31547 from kraney/boto_lambda 
boto_lambda: Add support for VPC access
 2016-02-29 14:10:52 -07:00
Kris Raney
4e27ffb8ad Avoid creating backwards-compat issues. 2016-02-29 13:00:17 -06:00
Nicole Thomas
9bb9a54f8d Merge pull request #31549 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-02-29 11:46:34 -07:00
rallytime
b683df9b82 Pylint fix 2016-02-29 11:12:55 -07:00
rallytime
9dff387351 Streamline Issue reporting template 2016-02-29 11:06:03 -07:00
rallytime
51aa26334c Correct versionadded tag for win_service.config 2016-02-29 10:53:10 -07:00
Mike Place
5a6aff1791 Merge pull request #31544 from DSRCompany/issues/29701_getattr_recursion_protection 
Protect getattr from recursion
 2016-02-29 10:48:15 -07:00
rallytime
24505d2dcf Merge branch '2015.5' into '2015.8' 
Conflicts:
  - salt/client/ssh/state.py
  - salt/fileclient.py
  - salt/minion.py
 2016-02-29 10:47:40 -07:00
Mike Place
4f3ab119c6 Merge pull request #31545 from kraney/boto_cloudtrail 
Raise minimum boto3 version so that multi-region cloud trails can be …
 2016-02-29 10:47:37 -07:00
Kris Raney
ac9a6cccb0 Add support for VPC access 2016-02-29 11:23:12 -06:00
Dmitry Kuzmenko
b7a45b8fae Protect getattr from recursion 2016-02-29 19:59:28 +03:00
Erik Johnson
7243bdb134 Merge branch 'nspawn' of https://github.com/llua/salt into llua-nspawn 2016-02-29 10:27:03 -06:00
Kris Raney
d52c18652e Raise minimum boto3 version so that multi-region cloud trails can be supported. 2016-02-29 10:14:21 -06:00
Mike Place
f2e2e6e3cf Merge pull request #31316 from kraney/kraney_bugfix 
Let ext_pillar_first determine the override order
 2016-02-29 09:09:35 -07:00
Mike Place
d5a4daa17b Merge pull request #31525 from DSRCompany/issues/30643_merge_forward_fixes 
Issues/30643 merge forward fixes
 2016-02-29 09:08:46 -07:00
Mike Place
de4678863b Merge pull request #31540 from tsaridas/boto_rds 
add function modify_db_instance
 2016-02-29 09:07:02 -07:00
Mike Place
53da394188 Merge pull request #31524 from kraney/boto_lambda 
boto_lambda robustness fix in the face of restricted policies
 2016-02-29 09:05:25 -07:00
Mike Place
01c9550953 Merge pull request #31527 from Ashald/bugfix/consul-pillar-empty-keys 
Consul Pillar: don't crash on empty values
 2016-02-29 09:04:33 -07:00
Mike Place
b9ca73d437 Merge pull request #31535 from kstreee/saltstack/salt#31534 
[saltstack/salt#31534] Resolve a bug that rest_tornado doesn't response for invalid and dictionary type of request body.
 2016-02-29 09:03:03 -07:00
Mike Place
dec4948711 Merge pull request #31533 from m03/add-list_sessions-to-rdp 
Add session info to rdp module
 2016-02-29 08:35:16 -07:00
Mike Place
95af21325f Merge pull request #31536 from virtrnd/remove-jessie-backports-from-raspbian-install 
Remove debian repo from raspbian installation
 2016-02-29 08:32:52 -07:00
Mike Place
060a60fd90 Merge pull request #31521 from terminalmage/issue24753 
salt-ssh: Fix race condition when caching files to build the thin tarball
 2016-02-29 08:32:22 -07:00
Mike Place
8e8036db3f Merge pull request #31518 from rallytime/testrunner-additions 
Add test runner options that were lost in merge-forward
 2016-02-29 08:31:53 -07:00
Mike Place
5965319600 Merge pull request #31528 from vutny/cloud-bootstrap-doc 
Correct Salt Cloud documentation about updating Salt Bootstrap script
 2016-02-29 08:30:59 -07:00
Mike Place
96c0926298 Merge pull request #31539 from DSRCompany/issues/31365_centos7_osrelease_fix 
Added temporary workaround for CentOS 7 os-release id bug.
 2016-02-29 08:30:34 -07:00
Mike Place
e255467a95 Merge pull request #31537 from DSRCompany/issues/fix_wheel_cmd_inheritance 
Fix WheelClient.cmd() inheritance.
 2016-02-29 08:29:50 -07:00
Mike Place
a0d8a226f1 Merge pull request #31523 from skizunov/develop2 
Fix 'failover' mode when using salt-call
 2016-02-29 08:02:50 -07:00
Mike Place
4c80d51b2b Merge pull request #31532 from LoveIsGrief/develop 
Public documentation for salt-cloud virtualbox
 2016-02-29 08:01:50 -07:00
Dmitry Kuzmenko
a3b806d126 Added temporary workaround for CentOS 7 os-release id bug. 2016-02-29 17:16:23 +03:00
Andrea Redi Tsarida
c9807104c1 add function modify_db_instance 2016-02-29 12:53:59 +01:00
virtualguy
e48900ac55 Use python-tornado from jessie-backports for pure debian 2016-02-29 22:42:15 +13:00
kstreee
91b5dc7048 [saltstack/salt#31534] Resolve a bug that rest_tornado doesn't response for 1. invalid request, 2. dictionary type of request, and add test cases for it. 
Typo in __init__.py
 2016-02-29 17:59:16 +09:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06:00
Dmitry Kuzmenko
ef42a58f70 Fix WheelClient.cmd() inheritance. 
The method is overriden just to update the PyDoc string. So it should
call parent method.
 2016-02-29 10:00:44 +03:00
virtualguy
6e338e2601 Remove debian repo from raspbian installation 
Binary packages from stock debain repo (http://httpredir.debian.org/debian) are not armv6 compatible so should not be installed on raspberry pi version 1. Rasbian doesn't have jessie-backports so safer just to install python-tornado from stretch.
 2016-02-29 19:20:51 +13:00
Morrie Winnett
036c73fb9e Add session info to rdp module 2016-02-28 13:42:44 -08:00
LoveIsGrief
0eba4cdf17 Public documentation for salt-cloud virtualbox 2016-02-28 17:29:02 +01:00
Eric Cook
17f7a2d90c nspawn.py: Fix bad keyword assignment 
Currently every keyword for _pull_image is considered a bad keyword.

```
% salt node nspawn.pull_tar url bar
ERROR executing 'nspawn.pull_tar': The following invalid keyword arguments were passed: verify=False.
```
 2016-02-28 00:32:52 -05:00
Denys Havrysh
f7beeb69f2 Correct Salt Cloud documentation about updating Salt Bootstrap script 2016-02-27 22:43:07 +02:00
Borys Pierov
b451f9be22 Consul Pillar: don't crash on empty values 2016-02-27 12:45:19 -05:00
Dmitry Kuzmenko
a50b33d96a Don't fork in try with critical finally logic. 
Fork executes finally section triple times.
 2016-02-27 11:21:11 +03:00
Sergey Kizunov
877bc25381 Fix minion failover after disconnect 
salt/minion.py:
- In the `__master_disconnected` case, it originally set
`self.opts['master']` to the result of `self.eval_master`. This
makes no sense since `self.eval_master` returns a future. Now we
yield on `self.eval_master` and store both return values.
- Just like in `Minion.destroy`, we clear `self.pub_channel.on_recv`.
Also, if `self.pub_channel` has a `close`, it is invoked. This
resolves a circular reference issue with the TCP transport. The
`SaltMessageClient` contains function references to the
`connect_callback` and `disconnect_callback` functions in
`AsyncTCPPubChannel`. This circular reference prevents the `del` from
deallocating the `AsyncTCPPubChannel` object.

salt/transport/tcp.py:
- In `SaltMessageClient.close`, reset the function references
`self.connect_callback` and `self.disconnect_callback`. This allows a
subsequent `del` on `AsyncTCPPubChannel` to actually deallocate the
object.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-27 11:08:34 +03:00
Kris Raney
ea4e5b76a0 boo_lambda robustness fix in the face of restricted policies 2016-02-26 17:53:10 -06:00
Nicole Thomas
9edd79d811 Merge pull request #31519 from jfindlay/launch_virtual 
launchctl, mac_assistive __virtual__: more LooseVersion, use osrelease
 2016-02-26 16:40:59 -07:00