valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,683 Commits 24 Branches 182 Tags 341 MiB
51eca1a6bd
Commit Graph

83683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
51eca1a6bd
enable tox for tests 2017-10-03 17:01:19 -06:00
Nicole Thomas
36b0b1174b Merge pull request #43854 from keesbos/2017.7 
Map __env__ in git_pillar before sanity checks
 2017-10-02 16:44:52 -04:00
Nicole Thomas
c81e8457b8 Merge pull request #43847 from cachedout/module_run_compare 
Fix to module.run
 2017-10-02 15:25:02 -04:00
Mike Place
b11f8c8f29 Merge pull request #17 from terminalmage/pr-43847 
Two fixes for upstream PR #43847
 2017-10-02 18:44:06 +02:00
Erik Johnson
93eaba7c54
Use six.iterkeys() instead of dict.keys() 
This avoids generating a new list on PY2.
 2017-10-02 11:40:00 -05:00
Erik Johnson
5d56a03a67
Improve failures for module.run states 
Bare asserts are zero help in troubleshooting. This commit changes the
tests that uses bare asserts such that they fail with a useful error
mesage as well as the return data from the module.run call.
 2017-10-02 10:48:45 -05:00
Mike Place
71780beb5a Merge branch '2017.7' into module_run_compare 2017-10-02 16:40:22 +02:00
Kees Bos
fba9c9a935 Map __env__ in git_pillar before sanity checks 
Backport of commit 1de6791069
 2017-10-02 09:14:49 +02:00
Mike Place
dd01e0ce67 Merge pull request #43844 from garethgreenaway/43819_redact_url_additions 
[2017.7] Changes to states/file.py and states/archived.py
 2017-10-01 11:08:47 +02:00
Mike Place
f0b985cbbe Merge branch 'module_run_compare' of ssh://github.com/cachedout/salt into module_run_compare 2017-10-01 11:00:47 +02:00
Mike Place
49f25b9f19 Lint 2017-10-01 10:59:09 +02:00
Mike Place
aefc773c2f Merge branch '2017.7' into module_run_compare 2017-10-01 10:58:16 +02:00
Mike Place
31d17c0124 Fix typo found by @s0undt3ch 2017-10-01 00:39:37 +02:00
Mike Place
5dba74d2cb Fix to module.run [WIP] 
DO NOT MERGE

For @terminalmage to review
 2017-09-30 22:41:30 +02:00
garethgreenaway
1f52546eab Merge pull request #43840 from twangboy/win_fix_test_augeas 
Fix `unit.states.test_augeas` for Windows
 2017-09-29 14:53:20 -07:00
Gareth J. Greenaway
c58c72aff9
When using URLs in archive.extracted, on failure the username & password is in the exception. Calling salt.utils.url.redact_http_basic_auth to ensure the credentials are redacted. 2017-09-29 14:31:46 -07:00
twangboy
fd1d6c31de
Fix unit.states.test_augeas for Windows 
Mock `os.path.isfile` so the test will continue
 2017-09-29 12:52:32 -06:00
Mike Place
c6fd2cd452 Merge pull request #43801 from terminalmage/issue43553 
Properly handle UNC paths in salt.utils.path.readlink()
 2017-09-29 11:58:01 +02:00
Erik Johnson
66e6e89dc7
Properly handle UNC paths in salt.utils.path.readlink() 
When unpacking the destination of a symbolic link in Windows, links
which point to UNC paths start with "UNC\" instead of "\\". This causes
win32file.GetLongFileName to raise an exception. This commit modifies
salt.utils.path.readlink() to return the path in the proper UNC format,
and it also updates the roots backend to simply use the link path rather
than the destination when following symlinks which point to a UNC path.
 2017-09-28 14:39:37 -05:00
Nicole Thomas
7304907db6 Merge pull request #43800 from Ch3LL/update_7.0 
Add note to nitrogen release notes about pip for cent6
 2017-09-28 13:36:48 -04:00
Ch3LL
50779c3b1c
Add note to nitrogen release notes about pip for cent6 2017-09-28 11:50:54 -04:00
Mike Place
6f687fdcff Merge pull request #43779 from twangboy/win_fix_test_state 
Fix `unit.modules.test_state` for Windows
 2017-09-28 16:27:02 +02:00
Mike Place
db0f569f7a Merge pull request #43782 from twangboy/win_fix_test_virt 
Fix `unit.modules.test_virt` for Windows
 2017-09-28 16:25:15 +02:00
Mike Place
dd4fc52f1e Merge pull request #43723 from nicholasmhughes/ini_manage-error-handling 
Fix ini_manage error and change handling
 2017-09-28 11:52:08 +02:00
Mike Place
5e29507c21 Merge pull request #43781 from twangboy/win_fix_test_status 
Fix `unit.modules.test_status` for Windows
 2017-09-28 11:06:18 +02:00
Mike Place
05c78ae649 Merge pull request #43785 from twangboy/win_fix_test_znc 
Fix `unit.modules.test_znc` for Windows
 2017-09-28 10:56:10 +02:00
Mike Place
10ddb8491c Merge pull request #43786 from twangboy/win_fix_test_zypper 
Fix `unit.modules.test_zypper` for Windows
 2017-09-28 10:51:58 +02:00
Mike Place
9615ca32d5 Merge pull request #43773 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-28 10:48:38 +02:00
garethgreenaway
1c05e37a66 Merge branch '2017.7' into win_fix_test_zypper 2017-09-27 20:15:18 -07:00
garethgreenaway
7d90721f6b Merge branch '2017.7' into win_fix_test_znc 2017-09-27 20:14:53 -07:00
garethgreenaway
9a9cc69d55 Merge pull request #43784 from twangboy/win_fix_test_win_service 
Fix `unit.modules.test_win_service`
 2017-09-27 20:14:38 -07:00
twangboy
aafec7ab0e
Fix unit.modules.test_zypper for Windows 
Use `os.linesep` for newline in expected return
 2017-09-27 16:59:36 -06:00
twangboy
228e74c8e3
Fix unit.modules.test_znc for Windows 
Mock the signal object as it's missing SIGUSR1 and SIGHUP on Windows
 2017-09-27 16:54:06 -06:00
twangboy
058e50e530
Fix unit.modules.test_win_service 
Mock `cmd.run`
 2017-09-27 16:37:12 -06:00
twangboy
7192332758
Fix unit.modules.test_virt for Windows 
Use os agnostic paths
Get system root from salt config
 2017-09-27 16:12:05 -06:00
twangboy
16ae8253c1
Mock which, use os.linesep for cmd.run return 2017-09-27 14:41:25 -06:00
twangboy
a64fe75816
Use os agnostic paths 2017-09-27 14:16:39 -06:00
garethgreenaway
f7035ed7da Merge branch '2017.7' into merge-2017.7 2017-09-27 12:54:43 -07:00
Nicole Thomas
1254da1df5 Merge pull request #43774 from The-Loeki/patch-1 
typo fix aka what is a 'masterarpi'
 2017-09-27 14:52:18 -04:00
Ronald van Zantvoort
84bbe85e60 typo fix aka what is a 'masterarpi' 2017-09-27 17:59:41 +02:00
rallytime
dfef4a722c
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-09-27 11:48:39 -04:00
garethgreenaway
1a8cc60bb4 Merge pull request #43772 from gtmanfred/2016.11 
dont print Minion not responding with quiet
 2017-09-27 08:39:17 -07:00
Nicole Thomas
3f888753d4 Merge pull request #43732 from twangboy/win_skip_mac_pkg_tests 
Skip `unit.stats.test_mac_packages` on Windows
 2017-09-27 10:48:07 -04:00
Nicole Thomas
fb86935d99 Merge pull request #43761 from Ch3LL/release_2017.7.2 
Release Notes for 2017.7.2
 2017-09-27 10:34:51 -04:00
Daniel Wallace
0194c60960
dont print Minion not responding with quiet 2017-09-27 08:29:41 -06:00
Nicole Thomas
5ea603cf16 Merge pull request #43767 from twangboy/win_skip_test_snapper 
Skip `unit.modules.test_snapper` on Windows
 2017-09-27 10:10:26 -04:00
Nicole Thomas
77c2c7cbf7 Merge pull request #43759 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2016.11 to 2017.7
 2017-09-27 09:30:37 -04:00
Nicole Thomas
5c203df056 Merge pull request #43748 from rallytime/fix-43737 
Add message to boto_kinesis modules if boto libs are missing
 2017-09-27 09:19:33 -04:00
twangboy
b41b9c8378
Skip snapper tests on Windows 2017-09-26 17:12:37 -06:00
Ch3LL
caf5795856
add mac patch notes 2017-09-26 17:27:29 -04:00