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
82,931 Commits 24 Branches 182 Tags 341 MiB
37029c1a16
Commit Graph

82931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
twangboy
37029c1a16 Fix unit.test_doc test 
Use findstr instead of grep on Windows
Use os.linesep for file paths
 2017-08-15 15:30:13 -06:00
Mike Place
730e71db17 Merge pull request #42951 from Ch3LL/2017.7.1_docs 
Add Security Notice to 2017.7.1 Release Notes
 2017-08-15 10:49:55 -06:00
Ch3LL
1d8f827c58 Add Security Notice to 2017.7.1 Release Notes 2017-08-15 12:37:50 -04:00
Nicole Thomas
c1c8cb9bfa Merge pull request #42868 from carsonoid/redisjobcachefix 
Stub out required functions in redis_cache
 2017-08-15 10:33:54 -04:00
Mike Place
e192d6e0af Merge pull request #42810 from amendlik/win-snmp-community 
Ignore error values when listing Windows SNMP community strings
 2017-08-14 21:55:15 -06:00
Mike Place
a1817f1de3 Merge pull request #42920 from cachedout/pid_race 
pid_race
 2017-08-14 21:49:09 -06:00
Mike Place
11a33fe692 Merge pull request #42925 from terminalmage/f26-debug-logging 
Add debug logging to troubleshoot test failures
 2017-08-14 21:47:50 -06:00
Erik Johnson
8165f46165 Add debug logging to troubleshoot test failures 
This adds logging to troubleshoot https://github.com/saltstack/salt-jenkins/issues/477
 2017-08-14 16:28:09 -05:00
Nicole Thomas
a537197030 Merge pull request #42913 from twangboy/win_change_timeout 
Change service shutdown timeouts for salt-minion service (Windows)
 2017-08-14 16:55:24 -04:00
Mike Place
ca0555f616 Merge pull request #42800 from skizunov/develop6 
Fix exception when master_type=disable
 2017-08-14 13:53:37 -07:00
Nicole Thomas
3af264b664 Merge pull request #42679 from cloudflare/napalm-multiprocessing 
Add multiprocessing option for NAPALM proxy
 2017-08-14 16:45:05 -04:00
Nicole Thomas
4fcdab3ae9 Merge pull request #42657 from nhavens/2017.7 
back-port #42612 to 2017.7
 2017-08-14 15:42:25 -04:00
Mike Place
5e930b8cbd If we catch the pid file in a transistory state, return None 2017-08-14 12:23:27 -07:00
Nicole Thomas
d2b6ce327a Merge pull request #42709 from whiteinge/doc-token_expire_user_override 
Add token_expire_user_override link to auth runner docstring
 2017-08-14 15:03:05 -04:00
Mike Place
c6a7bf02e9 Merge pull request #42848 from DSRCorporation/bugs/42753_mmaster_timeout 
Execute fire_master asynchronously in the main minion thread.
 2017-08-14 11:28:38 -07:00
twangboy
ffb23fbe47 Remove the line that wipes out the cache 2017-08-14 12:26:27 -06:00
Nicole Thomas
6a3279ea50 Merge pull request #42911 from gtmanfred/2017.7 
cloud driver isn't a provider
 2017-08-14 13:47:15 -04:00
twangboy
a3becf8342 Change service shutdown timeouts 
Windows default for stopping a service is 30 seconds. This changes the
default timeouts for the salt-minion service to more closely resemble
how it is handled in Windows. This gives Python a chance to cleanly exit
before being forcibly closed.
 2017-08-14 11:19:09 -06:00
Daniel Wallace
99046b441f cloud driver isn't a provider 
This will not have a ':' in it at all.
 2017-08-14 10:26:21 -06:00
garethgreenaway
4456f7383d Merge pull request #42860 from skizunov/develop7 
hash_and_stat_file should return a 2-tuple
 2017-08-14 08:44:54 -07:00
Nicole Thomas
c6ca7d639f Merge pull request #42889 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-08-14 10:16:19 -04:00
Nicole Thomas
4b6fe2ee59 Merge pull request #42898 from mirceaulinic/patch-11 
Minor eos doc correction
 2017-08-14 09:42:20 -04:00
Mircea Ulinic
93be79a135 Index eos under the installation instructions list 2017-08-12 23:15:11 +01:00
Mircea Ulinic
f903e7bc39 Minor eos doc correction 2017-08-12 23:11:25 +01:00
rallytime
fb7117f2ac Use salt.utils.versions.LooseVersion instead of distutils 2017-08-11 16:31:24 -04:00
Erik Johnson
1764878754 Merge pull request #42883 from rallytime/fix-boto-tests 
Fix failing boto tests
 2017-08-11 15:29:11 -05:00
rallytime
29ff19c587 Merge branch '2016.11' into '2017.7' 
Conflicts:
  - salt/config/__init__.py
  - salt/states/dockerng.py
  - salt/utils/cloud.py
 2017-08-11 15:17:19 -04:00
Nicole Thomas
b21778efac Merge pull request #42885 from terminalmage/fix-f26-tests 
Move weird tearDown test to an actual tearDown
 2017-08-11 15:14:41 -04:00
Nicole Thomas
c15d0034fe Merge pull request #41977 from redmatter/fix-dockerng-network-ignores-test 
Fix dockerng.network_* ignoring of tests=True
 2017-08-11 14:37:19 -04:00
Nicole Thomas
3b9c3c5671 Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs 
Adding missing output flags to salt cli docs
 2017-08-11 14:35:18 -04:00
garethgreenaway
9868ab6f3b Merge pull request #42887 from rallytime/fix-42870 
Remove extraneous "deprecated" notation
 2017-08-11 11:34:24 -07:00
rallytime
71e7581a2d Remove extraneous "deprecated" notation 
This deprecated notation was supposed to be on the "useradd_all"
function, but somehow was moved to the "useradd" function.

Fixes #42870
 2017-08-11 14:31:17 -04:00
Carson Anderson
885bee2a7d Stub out required functions for redis cache 
Without these functions the masters are
not able to use the redis cache completely

Signed-off-by: Carson Anderson <ca@carsonoid.net>
 2017-08-11 12:22:04 -06:00
rallytime
6a7bf99848 Lint fix: add missing space 2017-08-11 14:19:15 -04:00
Nicole Thomas
e5b98c8a88 Merge pull request #42882 from gtmanfred/2016.11 
make sure cmd is not run when npm isn't installed
 2017-08-11 13:53:14 -04:00
Nicole Thomas
da71f2a11b Merge pull request #42881 from gtmanfred/vmware 
fix vmware for python 3.4.2 in salt.utils.vmware
 2017-08-11 13:52:29 -04:00
Erik Johnson
462d653082 Move weird tearDown test to an actual tearDown 
Also catch KeyError when user doesn't exist
 2017-08-11 12:20:50 -05:00
Daniel Wallace
da3402a53d make sure cmd is not run when npm isn't installed 
apparently the skipIf on the functions still get run, even if the function is
going to be skipped based on a skipIf on the class.
 2017-08-11 10:58:00 -06:00
rallytime
43643227c6 Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-11 12:57:39 -04:00
Daniel Wallace
05ecc6ac8d fix vmware for python 3.4.2 in salt.utils.vmware 2017-08-11 10:14:38 -06:00
Nicole Thomas
5962c9588b Merge pull request #42788 from amendlik/saltify-timeout 
Remove waits and retries from Saltify deployment
 2017-08-11 11:38:05 -04:00
Nicole Thomas
227ecddd13 Merge pull request #42877 from terminalmage/add-cron-state-virtual 
Add virtual func for cron state module
 2017-08-11 11:33:09 -04:00
Nicole Thomas
ab9f6cef33 Merge pull request #42859 from terminalmage/gitpython-git-cli-note 
Add note about git CLI requirement for GitPython to GitFS tutorial
 2017-08-11 10:53:02 -04:00
Nicole Thomas
c7750d5717 Merge pull request #42845 from brejoc/updates-for-kubernetes-2.0.0 
API changes for Kubernetes version 2.0.0
 2017-08-11 10:04:30 -04:00
Nicole Thomas
459fdedc67 Merge pull request #42678 from frankiexyz/2017.7 
Add eos.rst in the installation guide
 2017-08-11 09:58:36 -04:00
Nicole Thomas
4ce96eb1a1 Merge pull request #42778 from gtmanfred/spm 
make sure to use the correct out_file
 2017-08-11 09:44:47 -04:00
Nicole Thomas
682b4a8d14 Merge pull request #42856 from gtmanfred/2016.11 
skip cache_clean test if npm version is >= 5.0.0
 2017-08-11 09:39:19 -04:00
Nicole Thomas
3d05d89e09 Merge pull request #42857 from gtmanfred/vmware 
use older name if _create_unverified_context is unvailable
 2017-08-11 09:37:58 -04:00
Erik Johnson
f1de196740 Add virtual func for cron state module 
This prevents a traceback when you attempt to use a cron state without
cron being installed.
 2017-08-11 08:32:19 -05:00
Nicole Thomas
01ea854029 Merge pull request #42864 from whiteinge/syndic-log-root_dir 
Make syndic_log_file respect root_dir setting
 2017-08-11 09:28:21 -04:00