Daniel Wozniak
1bf3fc86f7
Merge pull request #51867 from Oloremo/mysql-module-fix-for-python3
...
Decode mysql_version for python3 compatibility
2019-03-05 12:41:52 -07:00
Daniel Wozniak
7f05abf807
Merge pull request #51908 from garethgreenaway/51862_icinga_fixes
...
[2018.3] Adding __salt__ to utils/icinga so cmd.run_all is available.
2019-03-05 12:34:26 -07:00
Shane Lee
205657804f
Merge branch '2018.3' into add_compat_tests
2019-03-05 12:17:48 -07:00
Ch3LL
9adc19eeb1
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- doc/conf.py
- salt/modules/zfs.py
2019-03-05 14:08:35 -05:00
Daniel Wozniak
c68744a6c1
Merge pull request #51975 from s0undt3ch/features/nox-2018.3
...
[2018.3] Nox fixes
2019-03-05 11:58:33 -07:00
Dmitry Kuzmenko
01e9a3d77f
Merge branch '2018.3' into bugs/49147_ipc_subscriber
2019-03-05 21:21:06 +03:00
Shane Lee
e85f0043f6
Merge branch '2018.3' into add_compat_tests
2019-03-05 10:29:43 -07:00
twangboy
ea69062fb3
Fix lint
2019-03-05 10:28:59 -07:00
Pedro Algarvio
af4ae913d0
Lint fixes
2019-03-05 17:10:33 +00:00
Pedro Algarvio
ee4df3a43c
Lint fixes
2019-03-05 17:10:07 +00:00
Pedro Algarvio
33955c9ed1
Windows needs special treatment
2019-03-05 16:39:15 +00:00
Pedro Algarvio
d4f899ffe0
Requirements fixes
2019-03-05 16:39:09 +00:00
Pedro Algarvio
e550c602e8
We need a fixed winrm-fs so that dotfiles are also included
2019-03-05 16:39:01 +00:00
Pedro Algarvio
ada1ef35fa
use kitchen-salt from my fork for now
2019-03-05 16:38:56 +00:00
Pedro Algarvio
56f841f091
Windows needs special treatment
2019-03-05 16:34:07 +00:00
Pedro Algarvio
c3cb4479ec
Requirements fixes
2019-03-05 16:34:07 +00:00
Pedro Algarvio
6a67531a54
We need a fixed winrm-fs so that dotfiles are also included
2019-03-05 16:31:59 +00:00
Pedro Algarvio
15c6a53530
use kitchen-salt from my fork for now
2019-03-05 16:31:04 +00:00
Proskurin Kirill
dfcfebdcf2
Merge branch '2018.3' into mysql-module-fix-for-python3
2019-03-05 13:33:18 +00:00
Dmitry Kuzmenko
710ab50624
Support parallel work of multiple IPCMEssageSubscribers in one process
2019-03-05 14:22:32 +03:00
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
92752071c4
Merge branch '2017.7' into docs-sphinx-ref-deadlink-fix
2019-03-05 03:08:36 -07:00
Daniel A. Wozniak
5bbe5e0092
Fix up docstring
2019-03-05 02:36:41 -07: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
