Ch3LL
85e853a63d
Add darwin value for ssh grain items tests on MacOSX
2018-01-03 13:58:28 -05:00
twangboy
e3a8279c01
Get path to python binary based on executable
2018-01-03 10:19:09 -07:00
Nicole Thomas
eba360870a
Merge pull request #45233 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2018-01-03 10:33:59 -05:00
Nicole Thomas
1a04d205d1
Merge branch 'develop' into saltclass-followlinks
2018-01-03 09:14:50 -05:00
Nicole Thomas
111de4aadf
Merge branch 'develop' into fix_pillar_includes
2018-01-03 08:50:01 -05:00
Nicole Thomas
83452f78c8
Merge pull request #45246 from twangboy/win_fix_installer_typos
...
Fix a few minor typos in the installer script
2018-01-03 08:48:31 -05:00
Nicole Thomas
253b818e69
Merge pull request #45245 from twangboy/win_fix_cffi_dep
...
Roll cffi dep back to version 1.10.0
2018-01-03 08:47:03 -05:00
Victor
3e9d4ac0d5
#45147 - postgresql returner fails to connect to db when salt-ssh executes a function
2018-01-03 08:31:45 -05:00
Petr Michalec
d512360d0f
Enable saltclass to follow symlinks on path.os_walk
2018-01-03 09:38:55 +01:00
sumeetisp
12bad71b2a
Fixing lint errors
2018-01-03 10:50:38 +05:30
Steve Weber
507d854b3c
pillar body overrides includes
...
vars in pillar body override pillar includes
2018-01-03 00:04:32 -05:00
sumeetisp
d1caf1e28d
Merge branch 'develop' into develop
2018-01-03 10:00:21 +05:30
sumeetisp
23a2a1f7cf
Fixing lint errors
2018-01-03 09:37:28 +05:30
twangboy
1f2658bbeb
Fix a few minor typos in the installer script
2018-01-02 15:49:35 -07:00
twangboy
12e9d13b21
Roll cffi dep back to version 1.10.0
2018-01-02 15:30:24 -07:00
twangboy
03aec37040
Fix search/replace in Py3
2018-01-02 15:22:58 -07:00
rallytime
a3d251b2cd
Merge branch '2016.11' into '2017.7'
2018-01-02 15:21:58 -05:00
Nicole Thomas
b75f50afe3
Merge pull request #45235 from rallytime/bp-45209
...
Back-port #45209 to 2016.11
2018-01-02 15:20:14 -05:00
Łukasz Mierzwa
bf4058b264
Fix tests in test_local_cache to correctly check for removed dirs
2018-01-02 12:04:15 -08:00
Łukasz Mierzwa
1b243de693
Use correct path when cleaning old jobs in local_cache returner
...
local_cache returner uses 2 level directory structure:
upper: first 2 chars of the string generated by hashing the JID of the returning job
lower: remaining chars from the JID hash
This is done by running salt.utils.jid.jid_dir().
Upper dir contains lower dirs, lower dir contains job return data for the hashed JID.
clean_old_jobs() implemented here checks for return data files older than keep_jobs value, but when if finds such file it removes the upper dir instead of the lower dir. This means that any old job will result in the removal of all other jobs with JIDs that are hashed to a string with the same first two chars.
This PR corrects clean_old_jobs() to use the lower level dir when purging old jobs, which means that only specific job that was is old will be removed.
Fixes #45071
2018-01-02 12:04:12 -08:00
rallytime
69a38ae07f
Add Fluorine release notes file
2018-01-02 14:59:41 -05:00
Nicole Thomas
f86aea2914
Merge pull request #45237 from sjorge/mdata_tweaks_v2
...
Small fix for PR #45216
2018-01-02 14:53:37 -05:00
Nicole Thomas
4ae309af6a
Merge pull request #45222 from rallytime/merge-oxygen
...
[oxygen] Merge forward from 2017.7 to oxygen
2018-01-02 14:33:07 -05:00
Jasper Lievisse Adriaanse
e57f170001
sysctl.persist: fix crash when unable to apply a value
...
while here, adjust the sysctl state documentation as it can
also be used for configuring other kernels
2018-01-02 19:47:07 +01:00
Jorge Schrauwen
39e1facb31
Small fix for PR #45216
...
Due to juggling and rebasing, I messed up with 2 (). This fixes the
mistake.
2018-01-02 18:50:59 +01:00
Gareth J. Greenaway
ae10dd5965
Adding SLS file for new tests.
2018-01-02 09:50:14 -08:00
Nicole Thomas
693cc807e8
Merge pull request #45175 from amendlik/pkg-uptodate
...
Pkg uptodate
2018-01-02 12:38:35 -05:00
Nicole Thomas
17d30b2fc3
Merge pull request #45216 from sjorge/mdata_tweaks
...
Add ignore_retcode=True to the mdata commands
2018-01-02 12:35:35 -05:00
Nicole Thomas
4badb623ce
Merge branch 'develop' into ppa-use-proxy
2018-01-02 12:34:52 -05:00
Nicole Thomas
5d7386edc5
Merge pull request #45223 from rallytime/merge-develop
...
[develop] Merge forward from oxygen to develop
2018-01-02 12:33:52 -05:00
Daniel Wallace
2d0a9bbf7e
enable UsePAM for ssh tests
2018-01-02 12:29:43 -05:00
Gareth J. Greenaway
0c8052b7e1
Merge pull request #45146 from woodhead99/lock_password_null_pw_fix
...
updated lock_password() to handle null passwords
2018-01-02 09:28:46 -08:00
rallytime
5d9a1e91e9
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2018-01-02 12:23:50 -05:00
Nicole Thomas
d7f43eed2c
Merge branch 'develop' into vmctl
2018-01-02 12:08:38 -05:00
Nicole Thomas
3ab962b01a
Merge pull request #44965 from gtmanfred/2016.11
...
check if VALUE is a string_type
2018-01-02 11:42:38 -05:00
Nicole Thomas
70ccdef729
Merge pull request #45218 from gtmanfred/oxygen
...
fix up rackspace/openstack cloud test
2018-01-02 11:35:04 -05:00
Gareth J. Greenaway
f4a6bfded5
removing import six, fixing lint error.
2018-01-02 08:05:14 -08:00
Gareth J. Greenaway
b3a3d8822c
Updates to state.py to allow the onlyif & unless requisites to both work when specified in a state file.
2018-01-02 08:05:14 -08:00
Nicole Thomas
40fb30f63f
Merge pull request #45232 from rasathus/2016.11
...
Backport #27160 to 2016.11
2018-01-02 10:48:22 -05:00
Nicole Thomas
9ee4e242e6
Merge pull request #45128 from garethgreenaway/scheduler_cron_tests
...
[oxygen] Adding tests for cron functionality.
2018-01-02 10:47:36 -05:00
Nicole Thomas
190e00c8a1
Merge branch 'develop' into fix_pillar_includes
2018-01-02 09:58:55 -05:00
Nicole Thomas
bbd9255032
Merge pull request #45086 from mcalmer/fix-websocket-with-python3
...
fix websocket support with python3
2018-01-02 09:58:06 -05:00
Nicole Thomas
9409392caf
Merge pull request #45108 from pimiento/develop
...
priority for minion_blackout_whitelist by grains
2018-01-02 09:57:22 -05:00
Nicole Thomas
4f514a29a7
Merge branch '2017.7' into pkg-uptodate
2018-01-02 09:56:28 -05:00
Nicole Thomas
058ee70977
Merge pull request #45034 from brejoc/develop-logging-error-on-exit
...
Fix for pidfile removal logging
2018-01-02 09:06:12 -05:00
Rasathus
7a2bd8f49b
Merge branch '2016.11' into 2016.11
2018-01-02 12:38:13 +00:00
sumeetisp
e51348fbd7
Update azurearm.py
2018-01-02 17:37:05 +05:30
sumeetisp
859b700385
Made recommended changes
2018-01-02 10:16:43 +05:30
Gareth J. Greenaway
ba7ff8b2e0
Merge branch 'oxygen' into scheduler_cron_tests
2018-01-01 16:46:02 -08:00
Daniel Wallace
1b3f3ba1be
Merge pull request #45226 from gtmanfred/2017.7
...
Update kitchen to use runtests verifier on 2017.7
2017-12-31 11:13:27 -07:00
