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
Justin Findlay
2428f5f15d version: always show all system fields 
This makes the system version info handling more consistent with the
dependency version info: there are no hidden fields.
 2016-03-02 11:07:43 -07:00
Justin Findlay
2b8d1300e7 version: rename system and version platform info 2016-03-02 11:07:43 -07:00
Justin Findlay
ca40372bfa version: return mac_ver[2] only if it's defined 2016-03-02 11:07:43 -07:00
Justin Findlay
fabd39e6d5 version: add system platform to versions report 
Some platforms, such as Darwin, do not postitively identify the platform
name in any of the other system fields currently in the versions report.

Improves #21906.
 2016-03-02 11:07:43 -07:00
rallytime
5a862d3449 Add documentation for the behavior change in #31577 
Refs #31577
 2016-03-02 11:03:49 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
twangboy
33da2c613e Add tests for the remainder of the functions 2016-03-02 10:20:00 -07:00
Nicole Thomas
24d9b7448f Merge pull request #31608 from StephenPCG/develop 
monit.summary should only return the exact match of given svc_name
 2016-03-02 09:45:20 -07:00
Nicole Thomas
e0975598dd Merge pull request #31607 from m03/fix-rdp-get_session-docstring 
Fix docstring code-block alignment in rdp
 2016-03-02 09:42:45 -07:00
Nicole Thomas
38ddd62aef Merge pull request #31594 from rallytime/bp-31589 
Back-port #31589 to 2015.8
 2016-03-02 09:33:24 -07:00
Nicole Thomas
66a2e5f52f Merge pull request #31589 from techhat/updatenode 
Ensure that the latest node data is returned
 2016-03-02 09:31:52 -07:00
Kris Raney
ba33404d3e Fix a regression I caused in boto_cognitoidentity 
I popped the wrong argument. This didn't fail in my module since I didn't use that argument, but caused a failure in cognitoidentity.
 2016-03-02 10:24:44 -06:00
C. R. Oldham
86a0fc46b4 Merge pull request #31604 from joejulian/2015.8_31596_workaround_no_xml_when_not_tty 
Workaround for non-xml output from gluster cli when not tty
 2016-03-02 08:53:44 -07:00
Nicole Thomas
09815d905f Merge pull request #31602 from cachedout/fix_31523 
Fix issue with salt-call hanging
 2016-03-02 08:48:56 -07:00
Nicole Thomas
36ce240596 Merge pull request #31583 from vutny/remove-trailing-white-spaces 
Remove trailing white spaces
 2016-03-02 08:38:01 -07:00
Denys Havrysh
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Zhang Cheng
0be38467cc monit.summary should only return the exact match of given svc_name 
If there exists two services whose names are "prog" and "prog_bin",
monit.summary("prog") would return both services.

states.monit.monitor uses monit.summary() to determine the status
of a given service, but it only scans the first kind of resource,
and complains service not found if the service is not in the first
resource kind. In the above example, previous code would return:

  File:
    prog_bin:
      Accessible
  Process:
    prog:
      Not monitored

And state.monit.monitor("prog") would fail with

  Comment: prog not found in configuration

With this patch, monit.summary will only return the exact match
of given svc_name, makes state.monit.monitor always happy.
 2016-03-02 11:51:51 +08:00
Morrie Winnett
546ae30fda Fix docstring code-block alignment in rdp 2016-03-01 19:07:33 -08:00
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
Justin Findlay
cbb28492a3 modules.mac_power: add unit tests 2016-03-01 12:19:04 -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