Commit Graph

67080 Commits

Author SHA1 Message Date
Joe Julian
c567a823a9 Workaround for non-xml output from gluster cli when not tty
Gluster has a bug in versions prior to 3.6 in that they will replace the
cli output mode if isatty() returns false. This patch uses the script
utility to trick the cli into thinking it's being called from a tty to
allow xml output.

Upstream bug: https://bugzilla.redhat.com:443/show_bug.cgi?id=1047378

Fixes #31596
2016-03-01 18:02:01 -08:00
C. R. Oldham
c9fe8d87f3 Merge pull request #31592 from rallytime/bp-31546
Back-port #31546 to 2015.8
2016-03-01 16:51:02 -07:00
C. R. Oldham
c8dbc93ac6 Merge pull request #31593 from rallytime/bp-31570
Back-port #31570 to 2015.8
2016-03-01 16:50:05 -07:00
Mike Place
64f6046602 Fix issue with salt-call hanging
Refs #31523
2016-03-01 15:52:40 -07:00
Winston Liu
6f4e0c8715 moved the newly introduced parameter to end of the kwarg list. 2016-03-01 13:44:09 -08:00
Joseph Hall
6cd89459c7 Ensure that the latest node data is returned 2016-03-01 13:18:00 -07:00
C. R. Oldham
b2294d0a28 Need to return the value 2016-03-01 13:14:10 -07:00
Erik Johnson
9a296bd1bf Use clean_kwargs and invalid_kwargs utils funcs to handle invalid kwargs 2016-03-01 13:12:16 -07:00
Eric Cook
43099a2b63 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-03-01 13:12:11 -07:00
Nicole Thomas
068807558a Merge pull request #31567 from cachedout/issue_28585
Restore FIPS compliance when using master_finger
2016-03-01 12:50:02 -07:00
Joseph Hall
df10355ac9 Ensure that the latest node data is returned 2016-03-01 12:32:02 -07:00
Winston Liu
dfd5b73fa7 provided more flexibility for the lookup of lambda functions via a lambda_funcname_format parameter in the present state. 2016-03-01 10:01:26 -08:00
Mike Place
fc03b25556 Merge pull request #31573 from s-schweer/rabbitmq_user
fix return value of rabbitmq_user when tags are specified
2016-03-01 09:52:44 -07:00
Denys Havrysh
e7a8dbf498 Remove trailing white spaces in tests files 2016-03-01 17:40:02 +02:00
Denys Havrysh
776b2ea9a6 Remove trailing white spaces in files under salt/ dir 2016-03-01 17:38:39 +02:00
Denys Havrysh
fbfc3abccf Remove trailing white spaces in files under pkg/ dir 2016-03-01 17:37:18 +02:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Denys Havrysh
7eaf778695 Remove trailing white spaces in conf dir file 2016-03-01 17:35:34 +02:00
Score_Under
8e8e740529 Do not exclude groups beginning with "_" on OSX 2016-03-01 12:44:16 +00:00
Stefan Schweer
b1725547b2 fix return value of rabbitmq_user when tags are specified 2016-03-01 11:13:46 +01:00
Mike Place
dd96b20860 Merge pull request #31551 from rallytime/update-issue-template
Streamline Issue reporting template
2016-02-29 21:27:14 -07:00
Mike Place
bf16f3e49c Merge pull request #31559 from Ashald/feature/consul-pillar-yaml-deserialize
Use YAML to parse values in Consul pillar
2016-02-29 21:24:59 -07:00
Mike Place
8bb67d4fa8 Merge pull request #31546 from terminalmage/llua-nspawn
Rework of PR #31529
2016-02-29 21:23:59 -07:00
Mike Place
77d9aae8bb Merge pull request #31568 from twangboy/fix_perms
Grant permissions using SID instead of name
2016-02-29 21:22:53 -07:00
Mike Place
7006a1eecf Fix failed unit test 2016-02-29 21:15:43 -07:00
Mike Place
10cd328dda Lint 2016-02-29 21:15:43 -07:00
Mike Place
174337d020 Restore FIPS compliance when using master_finger
Resolves #28585
2016-02-29 21:15:43 -07:00
Mike Place
ada5ab344d Merge pull request #31561 from jtand/beacons_test_fix
Skipped test
2016-02-29 21:11:22 -07:00
Mike Place
467a7019b3 Merge pull request #31570 from cro/wheelclient_ret2
Need to return the value
2016-02-29 21:11:09 -07:00
C. R. Oldham
5542d16997 Need to return the value 2016-02-29 20:04:31 -07:00
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