Gareth J. Greenaway
85363189d1
Fixing vault when used with pillar over salt-ssh
2018-02-09 11:46:21 -05:00
rallytime
f51687e903
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2018-02-09 11:34:12 -05:00
Nicole Thomas
7fd00ec752
Merge pull request #45928 from garethgreenaway/45915_fixing_vault_pillar_for_salt_ssh
...
[2017.7] Fixing vault when used with pillar over salt-ssh
2018-02-09 11:32:34 -05:00
Nicole Thomas
fb378cebb0
Merge pull request #45934 from rallytime/bp-45902
...
Back-port #45902 to 2017.7.3
2018-02-09 11:31:07 -05:00
Nicole Thomas
0d74151c71
Merge pull request #45935 from rallytime/bp-45742
...
Back-port #45742 to 2017.7.3
2018-02-09 09:02:25 -05:00
Nicole Thomas
7779fea7ba
Merge pull request #45940 from dmurphy18/fix_aix_cmdmod
...
Fix use of su to use '-' on AIX
2018-02-09 07:09:10 -05:00
Ronald van Zantvoort
771758fbca
Merge branch '2017.7' into fix_cmd_run_all_bg
2018-02-09 08:32:48 +01:00
Erik Johnson
9cd47b39dd
Fix incorrect translation of docker port_bindings -> ports
...
The logic which ensures that we expose ports which are being bound,
even when not explicitly configured, was done incorrectly. UDP ports
were being passed to the API as '1234/udp' instead of (1234, 'udp').
This results in the port not being exposed properly.
The logic has been corrected. Additionally both the "ports" input
translation function, as well as the post-processing code (where the
port numbers configured in port_bindings were being added) both
contained code to "fix" any ports which were configured using
'portnum/tcp', as these must be passed to the API simply as integers. To
reduce code duplication, this normalization is now only performed at the
very end of the post-processing function, after ports have been
translated, and any missing ports from the port_bindings have been
added.
The unit test for the port_bindings input translation code, which was
written based upon the same incorrect reading of the API docs that
resulted in the incorrect behavior, have been updated to confirm the
(now) correct behavior. The unit test for the ports input translation
code has been updated to reflect the new normalization behavior.
Finally, an integration test has been added to ensure that we properly
expose UDP ports which are added as part of the post-processing
function.
2018-02-08 23:23:43 -06:00
twangboy
29912adc15
Move the test_rehash test to test_win_functions
2018-02-08 17:44:30 -07:00
twangboy
adc594c183
Remove duplicate link
2018-02-08 17:44:30 -07:00
twangboy
e84628c1eb
Add some comments to the code
2018-02-08 17:44:30 -07:00
twangboy
d50d5f582f
Add additional info to docs for broadcast_setting_change
2018-02-08 17:44:29 -07:00
twangboy
3a54e09cd9
Rename setting to message
2018-02-08 17:44:29 -07:00
twangboy
a3f9e99bc0
Change to a generic function to broadcast change
2018-02-08 17:44:29 -07:00
twangboy
79299361c3
Create refresh_environment salt util
2018-02-08 17:44:29 -07:00
twangboy
967b83940c
Fix rehash function
...
Use SendMessageTimeout instead of SendMessage which was causing the
system to hang in some scenarios
Use ctypes to access the dll directly instead of using pywin32 as this
seems to actually work
2018-02-08 17:44:28 -07:00
David Murphy
dd2788419b
Fix use of 'su' for AIX to use '-'
2018-02-08 17:43:30 -07:00
Nicole Thomas
9d14ad9ccf
Merge pull request #45925 from terminalmage/fix-spelling
...
Fix spelling error in docstring
2018-02-08 16:52:34 -05:00
Marc Vieira-Cardinal (VA2MVC)
6a0b5f7af3
Removed the chained copy
2018-02-08 16:36:20 -05:00
Marc Vieira-Cardinal (VA2MVC)
ad1150fad4
list.copy() is not compatible with python 2.7
...
I doubt that a .copy() is required there since list() would already create one but since the previous committer added it I am improving by replacing the .copy() with a [:] which makes a copy in python 2.7 and 3+
2018-02-08 16:36:19 -05:00
Erik Johnson
bb83e8b345
Add regression test for issue 45893
2018-02-08 16:31:23 -05:00
Erik Johnson
cdda66d759
Remove duplicated section in docstring and fix example
2018-02-08 16:31:23 -05:00
Erik Johnson
4b6351cda6
Check the effective saltenv for cached archive
...
This fixes a regression caused by using a saltenv other than `base`.
2018-02-08 16:31:23 -05:00
Ronald van Zantvoort
c54fcf7a2d
cmd: move separate DRY logging blocks into _run, prevent logging on bg=True, don't use_vt on bg
2018-02-08 21:43:02 +01:00
Erik Johnson
7a143fe454
Fix spelling error in docstring
2018-02-08 13:45:24 -06:00
Gareth J. Greenaway
259e60e5d4
Fixing vault when used with pillar over salt-ssh
2018-02-08 11:34:10 -08:00
Ronald van Zantvoort
ebb1f81a9b
cmd run: when running in bg, force ignore_retcode=True
2018-02-08 20:33:31 +01:00
Adam Friedman
1a75786b5a
Fix linter warnings.
...
saltstack/salt#45884
2018-02-09 05:16:59 +11:00
Nicole Thomas
0cbe93cd69
Merge pull request #45920 from rallytime/merge-2017.7
...
[2017.7] Merge forward from 2016.11 to 2017.7
2018-02-08 10:43:48 -05:00
rallytime
e4e4744218
Merge branch '2016.11' into '2017.7'
...
No conflicts.
2018-02-08 10:42:37 -05:00
Nicole Thomas
643a8a5278
Merge pull request #45814 from gtmanfred/2017.7
...
fix cookies dict size changing in http.query
2018-02-08 10:35:30 -05:00
Nicole Thomas
3a3f87c16d
Merge pull request #45877 from rallytime/new-release-notes
...
Add release notes file for 2017.7.4 release
2018-02-08 09:07:42 -05:00
Nicole Thomas
1c3cc00670
Merge pull request #45904 from rallytime/bp-41017
...
Back-port #41017 to 2017.7
2018-02-08 08:57:45 -05:00
Nicole Thomas
317d35bd15
Merge pull request #45907 from terminalmage/fix-grains-backport
...
Fix backport of grains fix
2018-02-08 08:57:26 -05:00
Nicole Thomas
dade5f0cab
Merge pull request #45906 from rallytime/bp-45548
...
Back-port #45548 to 2017.7
2018-02-08 08:57:06 -05:00
Nicole Thomas
82c473a1fe
Merge pull request #45902 from terminalmage/issue45893
...
Check the effective saltenv for cached archive
2018-02-08 08:41:59 -05:00
Nicole Thomas
fdedde3cfb
Merge pull request #45862 from rallytime/bp-45830
...
Back-port #45830 to 2017.7
2018-02-08 08:22:25 -05:00
Damon Atkins
b4d0b23891
py3 fix
2018-02-08 23:51:30 +11:00
Damon Atkins
75d9e20d8a
Add ignoring 'terminated', 'stopped' instances, to improve changes of a single match
2018-02-08 23:06:10 +11:00
Adam Friedman
82ec0b589c
Revert to using salt.utils.cloud.is_public_ip.
...
saltstack/salt#45884
2018-02-08 10:14:52 +11:00
Adam Friedman
9b6b01873b
Fix violations reported by flake8.
...
saltstack/salt#45884
2018-02-08 08:39:43 +11:00
Adam Friedman
a2bc155c73
Use __utils__['cloud.'] instead of salt.cloud.utils.
...
saltstack/salt#45884
2018-02-08 08:39:33 +11:00
Adam Friedman
98907a32cb
Ensure 'auth' parameter is correctly passed to dimensiondata driver.
...
Also ensure that it is nevertheless excluded from the event payload.
saltstack/salt#45884
2018-02-08 08:39:24 +11:00
Adam Friedman
de26b03e2c
Fix copy/paste bug in dimensiondata provider integration test.
...
saltstack/salt#45884
2018-02-08 08:39:07 +11:00
Adam Friedman
6b1b6be427
Add integration tests for dimensiondata cloud provider.
...
saltstack/salt#45884
2018-02-08 08:38:58 +11:00
Adam Friedman
f6ea9fed7d
Ensure that event data provided by the dimensiondata driver is serialisable.
...
saltstack/salt#45884
2018-02-08 08:38:43 +11:00
Erik Johnson
9d200efc26
Add regression test for issue 45893
2018-02-07 14:32:59 -06:00
Erik Johnson
6cf7e50cc4
Fix backport of grains fix
...
A fix recently made to the salt/grains/disks.py was backported to
2017.7, but the fopen function was moved in oxygen and so the function
does not exist in 2017.7.
This did not make it into 2017.7.3 so there is no need to add this fix
to any hotfixes.
2018-02-07 13:59:01 -06:00
Viktor Daniel
1befa7386c
Update x509.py
...
Fixed typo in docu string
2018-02-07 14:54:02 -05:00
Carsten Brandt
80c56cdcea
Fixed typo in pkg state documentation
...
A `:` is missing for the yaml to be valid. This was introduced by f4abf7f03a
2018-02-07 14:17:10 -05:00
