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
70,727 Commits 24 Branches 182 Tags 341 MiB
d4fb45d9f8
Commit Graph

70727 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mihai Dinca
91383c5a19 Add cp.push test 2017-02-14 17:16:28 +01:00
Joe Niland
c2edfdd464 Quote numeric user names so pwd.getpwnam handles them properly 2017-02-14 11:50:35 +11:00
Mike Place
6c854da1d4 Merge pull request #39300 from terminalmage/loader-optimization 
Replace more usage of str.format in the loader
 2017-02-13 12:01:18 -07:00
Mike Place
5286b5ff1b Merge pull request #39337 from terminalmage/issue34428 
Don't re-walk the roots fileserver in symlink_list()
 2017-02-13 11:41:16 -07:00
Mike Place
ce781deeb5 Merge pull request #39339 from cro/pillar_filetree_doc 
Add link to external pillar documentation for clarification.
 2017-02-13 11:40:12 -07:00
C. R. Oldham
410810cea2 Clarification on external pillar usage. 2017-02-11 23:07:38 -07:00
Erik Johnson
a7d2135dc2 Don't re-walk the roots fileserver in symlink_list() 
This prevents some unnecessary extra work when getting a list of
symlinks.
 2017-02-11 18:28:49 -06:00
Erik Johnson
fa3014393c Document the upstream RedHat bug with their pygit2 package (#39316) 
See https://github.com/saltstack/salt/issues/38630#issuecomment-274403448
 2017-02-10 16:09:35 -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
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
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
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
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
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
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
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
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
Mike Place
8e88f71dd9 Merge pull request #39227 from terminalmage/loader-optimization 
Loader optimzation
 2017-02-08 12:38:21 -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
Mike Place
d9b0671dbd Merge pull request #39231 from terminalmage/clarify-jenkins-depends 
Add clarification for jenkins execution module
 2017-02-08 12:34:45 -07:00
Mike Place
ddcff89a84 Merge pull request #39232 from terminalmage/issue21342 
Avoid recursion in s3/svn ext_pillars
 2017-02-08 12:33:27 -07:00
Nicole Thomas
ef4e437bbc Fix the win_ip_test failures (#39230) 
The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
 2017-02-07 14:53:59 -07:00
Erik Johnson
c88896c277 Avoid recursion in s3/svn ext_pillars 
This passes ``ext=False`` when compiling pillar data in these ext_pillar
sources.
 2017-02-07 15:38:53 -06:00
Erik Johnson
ad1b1255f2 Add clarification for jenkins execution module 
There are two modules on PyPI which import as "jenkins". Installing the
wrong one will result in a traceback when the execution module tries to
use the Python bindings. This commit adds information about the
dependency to the docstring for the module. It also checks to make sure
that jenkins.Jenkins is present in the __virtual__() func, and if not it
will fail to load the execution module with a meaningful error message
in the log.
 2017-02-07 15:03:11 -06:00
Daniel Wallace
afee047b08 default to utf8 encoding if not specified 
On errors, for some reason AWS does not always have an encoding on the
message.  Default to 'utf-8'.
 2017-02-07 14:28:03 -06:00
Erik Johnson
c750662946 Loader optimzation 
Use a str.join instead of str.format to make the full function name.
 2017-02-07 13:50:41 -06:00
Mike Place
df5f934c34 Merge pull request #39199 from rallytime/bp-39170 
Back-port #39170 to 2016.3
 2017-02-07 09:19:31 -07:00
Mike Place
2621c119fd Merge pull request #39206 from cachedout/issue_issue_37174 
Ignore empty dicts in highstate outputter
 2017-02-07 09:11:35 -07:00
Mike Place
dd440452ea Merge pull request #39209 from terminalmage/sorted-envs 
Sort the return list from the fileserver.envs runner
 2017-02-07 09:07:08 -07:00
Luitzen van Gorkum
e8a41d6341 Removes to early content stripping (stripping is allready done when needed with ident:true), fixes #39220 2017-02-07 15:14:52 +01:00
Luitzen van Gorkum
a4b169e0bd Fixed wrong logic, fixes #39220 2017-02-07 15:14:18 +01:00
Erik Johnson
e6dda4a625 Sort the return list from the fileserver.envs runner 2017-02-06 21:30:13 -06:00