valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
78,548 Commits 24 Branches 182 Tags 341 MiB
6b9d89d706
Commit Graph

78548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Algarvio
a878f89d9f
Provide a fallback class in case of import error 2017-02-13 10:18:56 +00:00
ninja
0f43fe652d Add _file_hash_and_stat master API function 2017-02-13 11:14:18 +01:00
Pedro Algarvio
8d581f5c41 Merge pull request #39348 from terminalmage/git_pillar-tests 
Fix some test instability in develop
 2017-02-13 09:23:59 +00:00
stein
a203de8919 函数分解 2017-02-13 16:23:17 +08:00
Erik Johnson
6ee6874e11 Set time back 1 week instead of up to 36 years in system module tests 
This prevents git_pillar certificate errors. Additionally, sometimes
/dev/rtc becomes unresponsive which leads the ``hwclock --compare``
command to spin indefinitely, ultimately causing the entire test run to
fail. This changeset uses a SIGALRM handler to abort the hwclock command
if no output is seen within 3 seconds and try a second time. If it times
out the second time as well, then an error will be logged but it will
not be fatal to the test (or hang it indefinitely).
 2017-02-12 23:57:28 -06:00
Erik Johnson
145f6fa786 Make log message more readable 2017-02-12 22:25:02 -06:00
Erik Johnson
ccfcf6867f Fix cwd for cleaning refs 2017-02-12 22:25:02 -06:00
Erik Johnson
64d1c19c0e Handle per-remote and global key types in enforce_types 2017-02-12 22:25:02 -06:00
Joe Niland
8d5afdb0ae win_iis module: list_sites - when retrieving bindings, ignore bindigs whose protocols do not have host headers 2017-02-13 13:37:05 +11:00
Erik Johnson
4e577e697d Switch to non-legacy git_pillar syntax in test suite 2017-02-12 15:12:49 -06:00
markuskramerIgitt
b65f5fef49 Removing unused msi_conformant_version_assert() 2017-02-12 16:19:21 +01:00
markuskramerIgitt
8f2b7538a5 Using __saltstack_version__, thanks to @s0undt3ch 2017-02-12 16:08:27 +01:00
Pedro Algarvio
4f8edc36a2 Merge pull request #39340 from terminalmage/issue39334 
Fix gpg renderer breakage from bef5e66
 2017-02-12 12:20:31 +00:00
Erik Johnson
6653d98c5a Fix gpg renderer breakage from bef5e66 
bef5e66 sought to make a PY3 compatibility change, but the attribute
from Python2's cStringIO module is not available via the "fake"
cStringIO which six exposes, as six's cStringIO is just the
cStringIO.StringIO function. The other cStringIO class attributes are
not available via six.

This commit adds a new module with a few functions to get information on
StringIO objects both in Python2 and 3, and modifies the files edited in
bef5e66 to use this new module to determine if the object is a readable
StringIO.

Fixes #39334.
 2017-02-12 01:24:09 -06:00
C. R. Oldham
410810cea2 Clarification on external pillar usage. 2017-02-11 23:07:38 -07:00
stein
e80a29e058 repair name error 2017-02-12 10:43:29 +08: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
Morgan Willcock
c4a85c73aa Suggest use of shutdown states in-place of the shutdown modules 2017-02-11 21:22:27 +00:00
Morgan Willcock
6f1699d062 Add reboot and shutdown states to win_system 2017-02-11 20:56:53 +00:00
Morgan Willcock
0f3abb613d Clarify success for shutdown function 2017-02-11 20:11:40 +00:00
markuskramerIgitt
527b84e2e0 Revoking TODO "static version" 2017-02-11 16:11:05 +01:00
stein
73034da52e repair aliyun api problem 2017-02-11 22:56:13 +08:00
markuskramerIgitt
7164b9c437 TODO and quirk "missing commit", TODO "static version" 2017-02-11 14:32:09 +01:00
markuskramerIgitt
61215ab45d Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-11 12:03:09 +01:00
Michael Calmer
17521fb23c added unit test for dockerng.sls_build dryrun option (#39305) 2017-02-10 16:11:26 -07: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
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
bricewge
60c4c0dde4 fix #39318 
don't try to switch users if you are already the right user
 2017-02-10 18:28:04 +01: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
050b4cc824 Protect hardware clock test comparison better (#39298) 
In #39060, some tests were added to check for the hardware clock
getting reset when possible. The test attempted to gate the test
when access to the hardware clock was impossible, but the check
wasn't quite right and caused problems with the resulting tests.

This change makes the `has_settable_hwclock()` function public
in order to make the test gate work correctly. This function
could also be useful at the CLI level.

When running `self.run_function('status._has_settable_hwclock()')`
from the test suite, the return is a string noting that the
function is unavailable. This change allows for the `if not` check
to evaluate the return of the function.
 2017-02-10 10:15:25 -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
Erik Johnson
954752b5fd Add test for __virtual_aliases__ 2017-02-10 08:48:57 -06: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
markuskramerIgitt
2a40840421 rst table requires + signs for column 2017-02-10 12:33:57 +01:00
markuskramerIgitt
7e25c637d9 wrong git branch 2017-02-10 12:29:13 +01:00
markuskramerIgitt
96958f4706 Merge branch 'develop' of https://github.com/saltstack/salt into develop 2017-02-10 12:24:20 +01:00
markuskramerIgitt
6f165a954a rst table requires + signs for column 2017-02-10 12:20:34 +01:00
kstreee
51972d0724 Removes a redundant test case after removed 'batch' in 'netapi'. 2017-02-10 07:12:22 +00:00
Erik Johnson
61ff2f3fd8 Add __virtual_aliases__ feature to the loader 
This commit modifies the loader to look for a ``__virtual_aliases__``
attribute when loading a module. If found, it will load the functions
under more than one module namespace in the ``__salt__`` dunder (i.e.
``modname.funcname`` and ``aliasname.funcname``).
 2017-02-09 19:54:01 -06:00
Mike Place
89283e0c04 Merge pull request #39215 from Mrten/patch-1 
remove (?x) modifiers in file.comment regex
 2017-02-09 16:11:12 -07: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
a80209caf7 Merge pull request #38767 from github-abcde/improve-templating 
template.py: Fix error thrown if default passed to compile_template i…
 2017-02-09 16:05:46 -07:00
Mike Place
a4fcdf3439 Merge pull request #39212 from carlpett/feature/vault-integration 
Merge carlpett/salt-vault
 2017-02-09 16:01:19 -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