valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,117 Commits 24 Branches 182 Tags 341 MiB
35335dd8e9
Commit Graph

81117 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mircea Ulinic
35335dd8e9 More opts and fixes 2017-05-04 12:50:49 +00:00
Nicole Thomas
0e0a73fd91 Merge pull request #41052 from terminalmage/gate-git_opts 
Gate the new git_opts argument in git execution module
 2017-05-03 17:10:06 -06:00
Nicole Thomas
2bf02fad81 Merge pull request #41050 from terminalmage/git_pillar-tests 
Fix git_pillar integration tests on Arch
 2017-05-03 16:53:31 -06:00
Nicole Thomas
ec214760df Merge pull request #41055 from saltstack/revert-40899-remove-md5-warning 
Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings"
 2017-05-03 16:49:55 -06:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Erik Johnson
f77393b80d Skip git_pillar integration tests on cent6 
Cent6 has too old of a version of git to handle the make_repo func that
spawns the git repos used in these tests.
 2017-05-03 16:36:36 -05:00
Erik Johnson
bd5e0bdbe3 Gate the new git_opts argument in git execution module 
The -c argument for git was added in version 1.7.2, but RHEL6 has 1.7.1.
This commit performs a version check if git_opts are passed, and raises
an exception if the git version is < 1.7.2.
 2017-05-03 16:31:58 -05:00
Erik Johnson
a94d081004 Add check for git-http-backend 
This allows for more graceful test failures when the libexec dir is
different from what the test class determines it should be.
 2017-05-03 15:16:16 -05:00
Erik Johnson
33515f6a14 Fix git_pillar integration tests on Arch 
The location of the git-http-backend is within /usr/lib instead of
/usr/libexec.

This also uncomments a line that was commented out for troubleshooting
purposes.
 2017-05-03 14:49:14 -05:00
Nicole Thomas
31c8b60ebf Merge pull request #41040 from gtmanfred/vaultdoc 
link vault pillar docs to vault module docs
 2017-05-03 13:31:34 -06:00
Mike Place
43af2669f6 Merge pull request #41010 from twangboy/fix_test_standard 
Fix test_full_returns integration test on Windows
 2017-05-03 12:18:25 -06:00
Mike Place
31a109172e Merge pull request #41037 from gtmanfred/tops 
add extmod whitelist and blacklist to tops
 2017-05-03 11:52:01 -06:00
Mike Place
a1f83ebb1e Merge pull request #41033 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-03 11:13:42 -06:00
Daniel Wallace
1183b8b557 link vault pillar docs to vault module docs 2017-05-03 11:11:00 -06:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning 
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
 2017-05-03 10:55:26 -06:00
Daniel Wallace
6d17e36ad2 add extmod whitelist and blacklist to tops 2017-05-03 10:20:26 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
rallytime
bed524a731 Update test hash to be sha256 instead of md5 2017-05-02 16:20:06 -06:00
Nicole Thomas
4a45dbdbac Merge pull request #41013 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-02 16:09:40 -06:00
Nicole Thomas
97500f078d Merge pull request #41012 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-02 16:06:39 -06:00
twangboy
c7d164423e Increase timeout of run_function 2017-05-02 16:01:06 -06:00
rallytime
a80f7256e9 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/engines/docker_events.py
  - salt/utils/winservice.py
 2017-05-02 12:55:04 -06:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
twangboy
3ef4734d0e Increase timeout for Windows 2017-05-02 11:37:01 -06:00
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg 
Minion key revoke cfg
 2017-05-02 11:18:05 -06:00
Mike Place
e210eaead4 Merge pull request #40726 from benediktwerner/fix-minions-remain-pending-after-autosign-and-typo 
Fixed minion keys remaining pending after auto signing and fixed typo (Resubmitted to 2016.3)
 2017-05-02 10:57:33 -06:00
Mike Place
044e0b2063 Merge pull request #40860 from twangboy/change_broadcast 
Remove dependency on win32gui
 2017-05-02 10:45:51 -06:00
Mike Place
4f342e2fe5 Merge pull request #40960 from danlsgiga/2016.11 
Fix consul module "AttributeError: 'dict' object has no attribute 'json'"
 2017-05-02 10:16:56 -06:00
Mike Place
c3b329b398 Merge pull request #40963 from twangboy/fix_win_useradd 
Fix fullname parameter for add function
 2017-05-02 10:08:58 -06:00
Mike Place
64eae1ab84 Merge pull request #40972 from ezh/fabric-fix-2-ssh_py_shim 
[#40971] Fix TypeError: must be str, not bytes for ssh_py_shim
 2017-05-02 10:06:24 -06:00
Mike Place
1f83498f9d Merge pull request #40980 from ezh/fabric-fix-docker-json 
Fix docker_events TypeError
 2017-05-02 09:58:09 -06:00
Mike Place
2cad90dd9e Merge pull request #40996 from terminalmage/issue40946 
Do not automatically unmask services to start/restart/etc. them
 2017-05-02 09:56:23 -06:00
Mike Place
d79c033239 Merge pull request #40995 from twangboy/remove_utils 
Remove unused code fragments
 2017-05-02 09:31:57 -06:00
Nicole Thomas
129859f79b Merge pull request #40952 from terminalmage/fix-dockerng.login-docs 
Fix documentation for docker login function in pre-nitrogen release branches
 2017-05-02 09:17:59 -06:00
Nicole Thomas
a79e43a913 Merge pull request #40998 from terminalmage/issue39349 
Fix some git_pillar integration test failures
 2017-05-01 17:18:16 -06:00
Nicole Thomas
c6162876d6 Merge pull request #40991 from rallytime/bp-40982 
Back-port #40982 to 2016.11
 2017-05-01 16:31:29 -06:00
Erik Johnson
39157b40ed Fix some git_pillar integration test failures 
For some reason these were not failing when I opened #40777, but now
that the PR is merged are failing for PR builds (as well as locally in
my test env). This fixes those failures.
 2017-05-01 17:13:42 -05:00
Erik Johnson
26d2f4a52a Do not automatically unmask services to start/restart/etc. them 2017-05-01 16:01:35 -05:00
twangboy
8c01aacd9b Remove unused code fragments 2017-05-01 14:26:37 -06:00
Mike Place
5e4babba89 Merge pull request #40964 from twangboy/update_deps 
Update Python and Deps for Py2 on Windows
 2017-05-01 13:55:26 -06:00
Mike Place
f766c97e26 Merge pull request #40777 from terminalmage/issue39349 
Add git_pillar integration tests
 2017-05-01 13:51:19 -06:00
Mike Place
6cfe7be47e Merge pull request #40994 from gtmanfred/file_tree 
only template pillar_tree files if specified
 2017-05-01 13:42:02 -06:00
Mike Place
3fb24929c6 Merge pull request #40987 from gtmanfred/2016.11 
get sudo_password correctly
 2017-05-01 13:39:54 -06:00
Mike Place
ecbac138d1 Merge pull request #40992 from gtmanfred/netdev 
fix bug in status.netdev
 2017-05-01 13:38:34 -06:00
Mike Place
d852320d34 Merge pull request #40993 from gtmanfred/smtp 
smtp state can use profile or sender
 2017-05-01 13:35:46 -06:00
Shane Lee
b442396bfe Merge pull request #4 from cachedout/pr-40860 
Fix failing test
 2017-05-01 13:24:38 -06:00
Nicole Thomas
a7c15b7c36 Merge pull request #40990 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-01 12:52:54 -06:00
Daniel Wallace
92fd24c107 only template pillar_tree files if specified 
This should only be templated if the user specifies that it should be
templated, otherwise we get a similar problem that is fixed here

https://github.com/saltstack/salt/pull/40464

Fixes #40978
 2017-05-01 12:20:39 -06:00
Mike Place
678595f869 Merge pull request #40944 from gtmanfred/cloud 
allow dynamic loading of cloud drivers
 2017-05-01 12:02:40 -06:00
Mike Place
9d12a614b7
Fix failing test 2017-05-01 11:50:39 -06:00