Commit Graph

83934 Commits

Author SHA1 Message Date
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
Andrei Belov
12845ae802
Several fixes for RDS DB parameter group management
In particular:

 - it is now possible to manage all the parameters in a group,
   without limiting to MaxRecords=100 (thanks to pagination);

 - update_parameter_group() now composes valid JSON payload,
   automatically substitutes boolean values to 'on' / 'off' strings;

 - parameter_present() now shows actual error message produced by
   ModifyDBParameterGroup API call.
2017-09-29 11:53:22 -04:00
rallytime
2ff02e4320
Merge branch '2016.11' into '2017.7'
No conflicts.
2017-09-29 11:39:43 -04: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
garethgreenaway
85b3aa332a Merge pull request #43807 from terminalmage/issue43522
cmdmod: Don't list-ify string commands on Windows
2017-09-28 19:48:35 -07: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
Erik Johnson
d8708bf698
cmdmod: Don't list-ify string commands on Windows
See https://github.com/saltstack/salt/issues/43522.
2017-09-28 13:10:03 -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
ea8d273c2b Merge pull request #43768 from vutny/fix-pylint-deprecation-warnings
Fix Pylint deprecated option warnings
2017-09-28 14:27:35 +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
Ch3LL
5fb3f5f6b1
Add Security Notes to 2016.3.8 Release Notes 2017-09-27 14:52:29 -04: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
Ch3LL
410c624f7a
[2017.7] Bump latest and previous versions 2017-09-27 12:25:30 -04:00
Ch3LL
f72bc00000
[2016.11] Bump latest and previous versions 2017-09-27 12:24:09 -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
f8b3fa9da1 Merge branch '2016.11' into fix-pylint-deprecation-warnings 2017-09-27 08:40:21 -07: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
garethgreenaway
3ebde1895f Merge branch '2016.11' into issue43373 2017-09-27 08:27:00 -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
Denys Havrysh
651ed16ad3 Fix Pylint deprecated option warnings 2017-09-27 10:38:47 +03: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
Erik Johnson
9dee896fb9 Merge pull request #43747 from rallytime/gpg-verification
Add GPG Verification section to Contributing Docs
2017-09-26 16:25:37 -05:00
Ch3LL
3d5fce0955
Add 2017.7.2 Release Notes 2017-09-26 17:21:24 -04:00
Nicole Thomas
88414d5f73 Merge pull request #43756 from gtmanfred/2017.7.2
split build and install for pkg osx
2017-09-26 16:51:28 -04:00
rallytime
120f49f2c4
Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/daemons/masterapi.py
  - salt/master.py
  - salt/runners/cache.py
2017-09-26 16:46:43 -04:00