Alberto Planas
ac688df875
mount: fix extra -t parameter
...
If 'fstype' parameter is not set in Linux environments, salt will
build a mount command with an empty -t value, making the command
fail.
2019-03-05 11:48:09 +01:00
Daniel Wozniak
a6891778ec
Merge pull request #51807 from Ch3LL/2018.3.5_rn
...
Add 2018.3.5 release notes
2019-03-05 02:27:23 -07:00
Daniel Wozniak
6aee2c4502
Merge pull request #51806 from twangboy/fix_beacon
...
Fix diskusage beacon on Windows
2019-03-05 02:23:10 -07:00
Daniel Wozniak
bfaa6a9365
Merge pull request #51895 from twangboy/win_update_2017.7
...
Add __virtual__ to win_update
2019-03-05 02:21:38 -07:00
Daniel Wozniak
da815ba12b
Merge pull request #51966 from twangboy/use_winapi_com
...
Use winapi.com instead of coinitialize
2019-03-05 02:04:43 -07:00
twangboy
eb984f5b32
Add unit tests for _compat.py
2019-03-04 18:08:18 -07:00
twangboy
a38300b156
Use winapi.com instead of coinitialize
2019-03-04 17:59:06 -07:00
Proskurin Kirill
b6d217c6ee
Merge branch '2018.3' into mysql-module-fix-for-python3
2019-03-04 10:56:03 +00:00
Daniel Wozniak
7673c694b4
Merge pull request #51920 from twangboy/add_zabbix
...
Add zabbix to the Windows builds
2019-03-03 14:15:23 -07:00
Proskurin Kirill
9745b0adfb
Fixed typo
2019-03-02 01:17:43 +00:00
Proskurin Kirill
8149e9e193
Merge branch '2018.3' into mysql-module-fix-for-python3
2019-03-02 01:14:55 +00:00
Daniel Wozniak
77c2796b94
Merge pull request #51802 from garethgreenaway/merge-2018.3.4
...
[2018.3] Merge forward from 2018.3.4 to 2018.3
2019-03-01 13:42:46 -07:00
Daniel Wozniak
496525df20
Merge pull request #51930 from Ch3LL/release_docs
...
Update release documentation
2019-03-01 13:29:22 -07:00
Daniel Wallace
1e7490c458
update kubernetesmod in index.rst
2019-03-01 13:52:27 -06:00
Gareth J. Greenaway
58ef51db75
Merge branch '2018.3' into 51673_multiple_file_sections_with_excludes
2019-03-01 11:40:07 -08:00
Daniel Wallace
1f3be1cb90
fix import in test
2019-03-01 13:37:42 -06:00
Daniel Wallace
8572c17091
rename kubernetes module to kubernetesmod
...
This makes sure this doesn't import the kubernetes module from
salt/modules while the kubernetes python module is not installed
2019-03-01 13:33:50 -06:00
Ch3LL
072cd84c7d
Update supported python versions in installation docs
2019-03-01 14:29:50 -05:00
Gareth J. Greenaway
a027c97140
Merge pull request #51931 from Ch3LL/bp_51298
...
Backport both #51298 and #51342
2019-03-01 09:28:53 -08:00
twangboy
873cabd6ce
Roll back some changes to _compat.py
2019-03-01 10:52:39 -05:00
Erik Johnson
1fcb0ff264
Fix edge case when minion ID is a 16-character string
...
Some code in salt._compat which checks if the value is a packed binary
representation of an IPv6 address fails if the value passed is not a
bytestring (i.e. a `unicode` type on PY2 or `str` type on PY3). This
fixes that code when the minion ID is a 16-character string (not a
bytestring). Note that the minion ID will never be a bytestring as of
2018.3.0, so this affects any 16-character minion ID when the minion ID
is checked to see if it is really an IP address.
2019-03-01 10:52:03 -05:00
Ch3LL
9a681367a6
Update release documentation
2019-03-01 10:21:02 -05:00
Proskurin Kirill
58d8a2e774
Merge branch '2018.3' into mysql-module-fix-for-python3
2019-03-01 00:03:25 +00:00
twangboy
e2d496cf94
Add zabbix to the Windows builds
2019-02-28 16:34:17 -07:00
Proskurin Kirill
f964962086
Added handling of empty server_version
2019-02-28 23:25:28 +00:00
Gareth J. Greenaway
b2cb1eb9a0
Merge branch '2017.7' into win_update_2017.7
2019-02-28 09:29:53 -08:00
Gareth J. Greenaway
8c4485d556
Merge branch '2018.3' into 51673_multiple_file_sections_with_excludes
2019-02-28 08:31:38 -08:00
Gareth J. Greenaway
2e20939ff4
Merge branch '2018.3' into merge-2018.3.4
2019-02-28 08:31:16 -08:00
Gareth J. Greenaway
233dbaf3c9
Adding __salt__ to utils/icinga so cmd.run_all is available.
2019-02-28 08:23:13 -08:00
Pedro Algarvio
7d6280d62b
Merge pull request #51875 from dwoz/avoid_ssl_race
...
Avoid race condition when initializing OpenSSL
2019-02-28 07:22:40 +00:00
Pedro Algarvio
e99654d4ee
Merge branch '2017.7' into avoid_ssl_race
2019-02-28 07:22:24 +00:00
Daniel Wozniak
c0bb1f7aee
Merge pull request #51850 from waynew/cherry-pick-ping-fix
...
fix reactor ping test
2019-02-27 17:35:20 -07:00
Daniel Wozniak
ad7a9ec0ee
Merge pull request #51893 from twangboy/gate_zfs_2017.7
...
Gate zfs module on Windows
2019-02-27 17:32:56 -07:00
Daniel Wozniak
1fa2072521
Merge pull request #51892 from twangboy/gate_zfs
...
Gate zfs grain on Windows
2019-02-27 17:32:31 -07:00
twangboy
0f125db1c2
Add __virtual__ to win_update
2019-02-27 17:28:53 -07:00
twangboy
e0d58eb95e
Gate zfs module on Windows
2019-02-27 14:38:33 -07:00
twangboy
fbc2c0c2a3
Gate zfs grain on Windows
2019-02-27 14:33:28 -07:00
Daniel Wozniak
6da495fd29
Fix linter
2019-02-27 11:36:37 -07:00
Daniel A. Wozniak
f758a100cb
Avoid race condition when initializing OpenSSL
2019-02-27 09:57:29 -07:00
Proskurin Kirill
58791e9951
Decode mysql_version for python3 compatibility
2019-02-27 13:57:11 +00:00
Daniel A. Wozniak
f78b360c0a
fix reactor ping test
2019-02-26 15:49:20 -06:00
Shane Lee
89b09912e1
Merge pull request #51836 from stratusjerry/backport_49039_2018.3
...
Update win_pkg.py
2019-02-26 09:52:13 -07:00
Gareth J. Greenaway
b55a894021
Fixing some code that was not working correctly with Python 3.
2019-02-26 08:23:16 -08:00
stratusjerry
35fdc4cec0
Update win_pkg.py
...
Fix path and other typos
2019-02-26 11:08:58 -05:00
Gareth J. Greenaway
63da8be7c9
Fixing a bug that caused excludes to not work as expected when multiple file options were in place, the excludes of the last file section were being used over any previous ones. Including a test to ensure excludes work as expected when multiple file sections are in place.
2019-02-25 17:19:39 -08:00
Ch3LL
2c0b85c8f6
Add 2018.3.5 release notes
2019-02-25 16:31:34 -05:00
twangboy
2bf6179743
Fix some lint
2019-02-25 13:15:43 -07:00
twangboy
0f38eea9a0
Add lowercase test
2019-02-25 12:52:17 -07:00
twangboy
14599851ca
Make sure drive letter is uppercase for re compare
2019-02-25 12:46:41 -07:00
twangboy
7cdc660552
Add some tests
2019-02-25 12:41:26 -07:00
