valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,144 Commits 24 Branches 182 Tags 341 MiB
18effe0103
Commit Graph

76144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
ce1f01f81a Merge pull request #39317 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-10 16:07:31 -07:00
rallytime
c1df446b7a Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/returners/postgres.py
  - salt/returners/postgres_local_cache.py
 2017-02-10 10:18:26 -07:00
Nicole Thomas
9de559ff4e Merge pull request #39313 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2017-02-10 09:23:22 -07:00
Ch3LL
b3cbc5a408 improve salt-run salt.cmd test 2017-02-10 09:00:12 -07:00
rallytime
0b8dddf12b Merge branch '2015.8' into '2016.3' 
No conflicts.
 2017-02-10 08:24:51 -07:00
Nicole Thomas
dd3ca0ecb0 Fix #38595 - Unexpected error log from redis retuner in master's log (#39299) 2017-02-10 08:21:57 -07:00
Morgan Willcock
dcb4d05275 win_system: return False from a skipped reboot 
...and clarify what success represents.
 2017-02-10 14:26:08 +00:00
kstreee
51972d0724 Removes a redundant test case after removed 'batch' in 'netapi'. 2017-02-10 07:12:22 +00:00
Ivan Babrou
af9578631e
Properly log address that failed to resolve or pass connection check 2017-02-09 22:42:22 -08:00
Ivan Babrou
9a34fbeba9
Actually connect to master instead of checking route availability 2017-02-09 17:09:40 -08:00
Mike Place
c3c621aab0 Merge pull request #38464 from doublescoring/fix-2016.11-38451 
[38451] Fix file.replace 2016.11
 2017-02-09 16:07:48 -07:00
Mike Place
f16027d30e Merge pull request #39297 from cro/pg_returner_docs 
Add doc to recommend pgjsonb for master job caches
 2017-02-09 15:49:58 -07:00
Mike Place
fc551bcf5d Merge pull request #39293 from sergeizv/grammar-fix 
Grammar fix
 2017-02-09 15:49:10 -07:00
Mike Place
8a1b45632a Merge pull request #39295 from sergeizv/typo-fix 
Fix typo
 2017-02-09 15:48:58 -07:00
Erik Johnson
d3e5d1525e Replace more usage of str.format in the loader 
This performs additional optimizations like the ones done in #39227.
 2017-02-09 16:34:32 -06:00
Mike Place
cfaafece34 Merge pull request #39296 from sergeizv/whitespace-fix 
Whitespace fix in docs Makefile
 2017-02-09 15:26:23 -07:00
Mike Place
0b4dcf4a47 Merge pull request #39294 from sergeizv/fix-link 
Fix link in proxyminion guide
 2017-02-09 15:15:51 -07:00
C. R. Oldham
28bac649ae Typo 2017-02-09 14:49:45 -07:00
C. R. Oldham
19fedcdd23 Add doc to recommend pgjsonb for master job caches 2017-02-09 14:46:59 -07:00
Mike Place
6365211a6f Merge pull request #39291 from terminalmage/pillar-docs 
Add note about using saltenv jinja var in pillar top files
 2017-02-09 14:43:49 -07:00
Ivan Babrou
c494839c65
Avoid bare exceptions in dns_check 2017-02-09 13:26:26 -08:00
Mike Place
77e50ed8b7 Merge pull request #39286 from terminalmage/fix-pillarenv-precedence 
Allow minion/CLI saltenv/pillarenv to override master when compiling pillar
 2017-02-09 14:22:45 -07:00
Erik Johnson
fbd551e069 Add note about using saltenv jinja var in pillar top files 
This adds some useful information to the pillar docs.
 2017-02-09 14:39:09 -06:00
Ivan Babrou
29f376676d
Rewrite dns_check to try to connect to address 2017-02-09 11:58:08 -08:00
Ivan Babrou
55965ce505
Autodetect IPv6 connectivity from minion to master 2017-02-09 11:33:21 -08:00
Sergei Zviagintsev
1d4c1dc140 Whitespace fix in docs Makefile 
Remove extra empty line
 2017-02-09 19:19:09 +01:00
Sergei Zviagintsev
04bde6eed2 Fix link in proxyminion guide 2017-02-09 19:18:13 +01:00
Sergei Zviagintsev
5d9f36d58d Fix typo 
manor -> manner
 2017-02-09 19:16:08 +01:00
Sergei Zviagintsev
70f2b586d3 Rewrap paragraph 
Rewrap the paragraph to fit in 80 chars line. The contents isn't
changed.
 2017-02-09 19:13:01 +01:00
Mike Place
52440416ca Merge pull request #39221 from lvg01/fix-bug-39220 
Fix bug 39220
 2017-02-09 11:12:28 -07:00
Erik Johnson
3cb9833e57 Allow minion/CLI saltenv/pillarenv to override master when compiling pillar 
Because we check in the master opts first, if the environment or
pillarenv values are set in the master config file, they will take
precedence over the values specified in the minion config (or gathered
via the CLI). This commit fixes that ordering such that the values
passed to __gen_opts() take precedence over the values from the master
config.
 2017-02-09 12:04:11 -06:00
Sergei Zviagintsev
e6ab5178ea Grammar fix 
Use 'if' instead of 'in case'
 2017-02-09 19:02:29 +01:00
Mike Place
a496ec2a16 Merge pull request #39281 from twangboy/win_installer 
Require VCRedist on 2008R2 and below instead of 2008
 2017-02-09 10:59:56 -07:00
Erik Johnson
5a27207c57 Add warning for Dulwich removal (#39280) 
Dulwich support is being removed for the Oxygen release (see #39210).
 2017-02-09 10:33:20 -07:00
Nicole Thomas
db6140aa83 Merge pull request #39264 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-09 10:10:13 -07:00
Mike Place
304eb19b18 Merge pull request #39276 from gtmanfred/2016.11 
_device_mismatch_ignored will never be True
 2017-02-09 10:05:27 -07:00
twangboy
ef5078729a Capitalize the 'r' for 2008R2 2017-02-09 09:55:59 -07:00
twangboy
1b6bd634ac Require VCRedist on 2008R2 and below instead of 2008 2017-02-09 09:47:47 -07:00
rallytime
a9c2c106c1 Pylint fix 2017-02-09 08:50:56 -07:00
Daniel Wallace
6635a9fd3b _device_mismatch_ignored will never be True 
It will be the name of the device that has matched the regex
 2017-02-09 09:45:24 -06:00
rallytime
f6aad99db2 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/loader.py
  - salt/output/highstate.py
  - salt/runners/fileserver.py
 2017-02-08 16:57:54 -07:00
Erik Johnson
1b9217d636 Update jsonschema tests to reflect change in jsonschema 2.6.0 (#39260) 
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
 2017-02-08 16:51:56 -07:00
Mike Place
7611698474 Merge pull request #39238 from dmurphy18/fix_aix_disk_mount 
Update disk fstype, inodeusage, percent and mount.active functions for AIX support
 2017-02-08 14:53:31 -07:00
Erik Johnson
c1d16cc3d0 Better handling of enabled/disabled arguments in pkgrepo.managed (#39251) 
This reverses the decision made in #35055 to deprecate the "enabled"
parameter in this state. This was a poorly-conceived decision, likely
made because the "enabled" param was not included in the docstring for
the pkgrepo.managed state under the "YUM/ZYPPER" section, while the
"disabled" param *was* listed under the "APT" section.

"disabled" isn't a thing in yum/dnf, so there was never any reason to
try to shoehorn it in. Not to mention the fact that the "disabled"
argument isn't even supported in Zypper, which effectively breaks Zypper
support.

This commit normalizes enabled/disabled based on platform, so passing
"enabled" in APT will pass the opposite value as "disabled", and
vice-versa on the other platforms. This allows enabled/disabled to be
used interchangeably.

It also more gracefully handles booleans in yum/dnf/zypper, so that a
bool can be properly compared to a 1/0 value.
 2017-02-08 14:52:45 -07:00
David Murphy
a8a519c493 Removed space for pylint 2017-02-08 12:42:14 -07:00
Mike Place
8e88f71dd9 Merge pull request #39227 from terminalmage/loader-optimization 
Loader optimzation
 2017-02-08 12:38:21 -07:00
David Murphy
8fa0ffa427 Updates due to code review comments 2017-02-08 12:38:14 -07:00
David Murphy
97c59a8d1c Updated mount functionality for active on AIX 2017-02-08 12:38:14 -07:00
David Murphy
1a32b2cc89 Updated disk functionality for fstype, inodeuage and percent on AIX 2017-02-08 12:38:14 -07:00
Mike Place
bc89b297f8 Merge pull request #39228 from gtmanfred/2016.3 
default to utf8 encoding if not specified
 2017-02-08 12:36:57 -07:00