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
Joe Niland
18effe0103 Detect IIS version and vary certificate association command depending on version 2017-02-23 22:30:13 +11:00
Mike Place
5987c4e30e Merge pull request #39573 from thatch45/ssl_docs 
Added a few more comments to the ssl docs
 2017-02-22 19:17:13 -07:00
Mike Place
b8e321cbec Merge pull request #39577 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-22 19:10:11 -07:00
Nicole Thomas
cff9334929 Merge pull request #39574 from Ch3LL/update_release_notes 
Update 2016.11.3 release notes
 2017-02-22 17:10:22 -07:00
rallytime
397c756a01 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-02-22 16:51:31 -07:00
rallytime
c52cecd856 Fix syntax error leftover from incomplete merge-conflict resolution 2017-02-22 16:51:01 -07:00
Nicole Thomas
8352e6b44b Merge pull request #39579 from rallytime/fix-lint 
[2016.3] Pylint: Remove unused import
 2017-02-22 16:46:33 -07:00
rallytime
65889e1f30 [2016.3] Pylint: Remove unused import 2017-02-22 16:45:37 -07:00
Mike Place
43dba3254c Merge pull request #39578 from cachedout/2016.3 
Add mention-bot configuration
 2017-02-22 16:39:23 -07:00
Mike Place
344499eef7
Add mention-bot configuration 2017-02-22 16:37:54 -07:00
rallytime
7b9b3f700d Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-22 16:27:08 -07:00
Ch3LL
c0f8c35df7 fix reference to set in docs 2017-02-22 16:09:16 -07:00
Ch3LL
663f6f159d add additional PRs to 2016.11.3 release notes 2017-02-22 16:04:05 -07:00
Thomas S Hatch
b230c35eac This should be good to go now 2017-02-22 14:29:24 -07:00
Mike Place
8f7a0f9d96 Merge pull request #39542 from twangboy/gate_ssh_known_hosts 
Gate ssh_known_hosts state against Windows
 2017-02-22 13:16:40 -07:00
twangboy
c90a52ef27 Remove expensive check 2017-02-22 12:27:14 -07:00
Mike Place
c10965833a Merge pull request #39289 from bobrik/autodetect-ipv6 
Autodetect IPv6 connectivity from minion to master
 2017-02-22 12:05:32 -07:00
Mike Place
3fb928b63a Merge pull request #39569 from s0undt3ch/2016.3 
Don't use our own six dictionary fixes in this branch
 2017-02-22 11:59:48 -07:00
Mike Place
91e3319df8 Merge pull request #39508 from dincamihai/openscap 
Openscap
 2017-02-22 11:36:35 -07:00
Mike Place
b492f7094c Merge pull request #39528 from thatch45/ssl_docs 
Add better ssl option docs
 2017-02-22 11:29:46 -07:00
Mike Place
0dad49cdff Merge pull request #39532 from amontalban/corner_case_35869 
Fix case when /etc/localtime is a file and it is not updated
 2017-02-22 11:28:53 -07:00
Mike Place
9cfaf3b599 Merge pull request #39540 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-02-22 11:24:00 -07:00
Pedro Algarvio
49da135abd
Don't use our own six dictionary fixes in this branch 2017-02-22 17:18:55 +00:00
Mike Place
56fe2f198e Merge pull request #39554 from DSRCorporation/bugs/ssl_bool 
Cosmetic: support bool value for 'ssl' config option.
 2017-02-22 09:59:02 -07:00
Mike Place
cf37f83565 Merge pull request #39560 from vutny/cloud-detect-ips 
[CLOUD] Log error when private/public IP was not detected
 2017-02-22 09:49:46 -07:00
Mike Place
fbe2194a93 Merge pull request #39562 from terminalmage/issue30802 
Add ulimits to dockerng state/exec module
 2017-02-22 09:31:48 -07:00
rallytime
49fe4e891e Merge branch '2016.11' into '2016.11' 
No conflicts.
 2017-02-22 08:54:57 -07:00
Erik Johnson
01d4a84a2f dockerng.get_client_args: Fix path for endpoint config for some versions of docker-py (#39544) 2017-02-22 08:51:22 -07:00
Erik Johnson
c50374041d Add ulimits to dockerng state/exec module 2017-02-22 09:20:49 -06:00
Denys Havrysh
567bb50884 [CLOUD] Log error when private/public IP was not detected 2017-02-22 16:52:04 +02:00
Dmitry Kuzmenko
7a6fc11291 Cosmetic: support bool value for 'ssl' config option. 
This is useful for minion config which doesn't need anything to be set
in ssl opts, but needs to enable it. In this case `ssl: True` looks
better than `ssl: {}` in yaml config.
 2017-02-22 14:06:26 +03:00
Mike Place
40f72db53e Merge pull request #39536 from twangboy/fix_win_status 
Namespace 'status' functions in 'win_status'
 2017-02-21 16:45:31 -07:00
twangboy
6d645cae0e Add __virtual__ function 2017-02-21 14:54:21 -07:00
rallytime
c613d19e76 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/dockerng.py
  - salt/states/dockerng.py
 2017-02-21 13:59:14 -07:00
twangboy
d5453e2f9e Remove unused import (lint) 2017-02-21 13:34:31 -07:00
Erik Johnson
dc8f578447 Merge pull request #39534 from rallytime/fix-pkg-function-specs 
Fix breakage in aptpkg and dpkg execution modules
 2017-02-21 14:31:14 -06:00
Denys Havrysh
1d0d7b24c1 Upgrade SaltTesting to run test suite for 2016.11 and add SaltPyLint (#39521) 2017-02-21 13:30:16 -07:00
twangboy
837c32e673 Remove list2cmdline 2017-02-21 12:11:56 -07:00
twangboy
c258cb3f73 Streamline wmic command returns for easier parsing 2017-02-21 12:06:56 -07:00
Erik Johnson
da42040c1a Try the docker-py 2.0 client name first 
This should give us a modest perfomance improvement as more people begin
to use docker-py>=2.0.
 2017-02-21 12:47:14 -06:00
twangboy
6d2cf8171e Fix 'ping_master' function 2017-02-21 11:12:06 -07:00
Thomas S Hatch
c357e37831 Add minion config 2017-02-21 11:09:46 -07:00
rallytime
d34a8fe9dc Fix breakage in aptpkg and dpkg execution modules 
The change in #39418 added a keyword argument before the *args
definition, which doesn't work. We need to use **kwargs after
the *names or *packages references.

This PR updates the affected functions to remove the ``failhard=True``
definitions to use **kwargs instead, cleans **kwargs, retrieves the
"failhard" option, and then errors if additional, unexpected kwargs
are passed in.
 2017-02-21 10:58:39 -07:00
twangboy
d946d10597 Namespace 'status' functions in 'win_status' 2017-02-21 10:53:04 -07:00
Andres Montalban
f0d3c16547 Fix case when /etc/localtime is a file and it is not updated 2017-02-21 14:37:30 -03:00
Thomas S Hatch
539bb2aa80 Add better ssl option docs 2017-02-21 08:48:42 -07:00
Erik Johnson
dff35b58f8 Merge pull request #39498 from terminalmage/pr-39483 
Resubmit PR #39483 against 2016.3 branch
 2017-02-20 13:35:32 -06:00
Mihai Dinca
9fedb84607 Always return oscap's stderr 2017-02-20 10:36:01 +01:00
Mihai Dinca
0ecde2cd02 Include oscap returncode in response 2017-02-20 10:36:01 +01:00
Mike Place
6418e725ed Merge pull request #39497 from terminalmage/docker-compat-fixes 
Two dockerng compatibility fixes
 2017-02-19 10:43:36 -07:00