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
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
Proskurin Kirill
f964962086
Added handling of empty server_version
2019-02-28 23:25:28 +00:00
Gareth J. Greenaway
2e20939ff4
Merge branch '2018.3' into merge-2018.3.4
2019-02-28 08:31:16 -08: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
fbc2c0c2a3
Gate zfs grain on Windows
2019-02-27 14:33:28 -07:00
Proskurin Kirill
58791e9951
Decode mysql_version for python3 compatibility
2019-02-27 13:57:11 +00: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
stratusjerry
35fdc4cec0
Update win_pkg.py
...
Fix path and other typos
2019-02-26 11:08:58 -05:00
Gareth J. Greenaway
769f002037
Merge branch '2018.3.4' into merge-2018.3.4
2019-02-25 10:34:58 -08:00
Megan Wilhite
c1ab63dd45
Merge pull request #51771 from Ch3LL/doc_conf_2018
...
Update release versions for the 2018.3 branch
2019-02-25 09:14:26 -05:00
Daniel Wozniak
98f1b0362f
Merge pull request #51775 from garethgreenaway/merge-2017.7
...
[2018.3] Merge forward from 2017.7 to 2018.3
2019-02-23 15:19:05 -07:00
Gareth J. Greenaway
92ffe039bc
fixing lint
2019-02-22 17:06:04 -08:00
Gareth J. Greenaway
73b601da37
Merge branch '2017.7' into merge-2017.7
2019-02-22 15:56:44 -08:00
Daniel Wozniak
7e3e71ca23
Merge pull request #51756 from twangboy/fix_case_sensitive
...
Make recurse and directory case sensitive
2019-02-22 16:06:10 -07:00
Ch3LL
904beb3548
[2018.3] change build_type and release in doc/conf.py
2019-02-22 15:18:33 -05:00
Ch3LL
3efcea50f1
Update release versions for the 2018.3 branch
2019-02-22 15:01:24 -05:00
twangboy
4c55040ecf
Fix failing py3 tests
...
This should fix the following integration tests
integration.states.test_file.FileTest.test_directory_clean_require_in
integration.states.test_file.FileTest.test_directory_clean_require_in_with_id
integration.states.test_file.FileTest.test_directory_clean_require_with_name
integration.states.test_file.FileTest.test_recurse_clean
integration.states.test_file.FileTest.test_recurse_clean_specific_env
2019-02-22 11:44:39 -07:00
twangboy
64f45f8650
Make recurse and directory case sensitive
2019-02-22 11:44:39 -07:00
Daniel Wozniak
e75fc1c603
Merge pull request #51747 from ymasson/fix_mysql_grants
...
Fix escaping for special charaters
2019-02-22 11:20:17 -07:00
Thomas S Hatch
b1f7e85b4f
Merge pull request #51387 from chrillux/make-binarydata-output-possible
...
Make binary data output possible
2019-02-22 07:53:24 -07:00
Daniel Wozniak
e04f735dec
Merge pull request #51502 from ogd-software/51501-states-boto3_route53.py-fails-to-validate-ALIAS-A-records
...
51501 states boto3 route53.py fails to validate alias a records
2019-02-22 01:18:35 -07:00
Yann Masson
f614dd7d54
Fix escaping for special charaters
...
Issue #49297
2019-02-21 18:41:05 +01:00
Daniel Wozniak
3475813d13
Merge pull request #51694 from assafShapira/2018.3
...
fix minion bootstrapping issue
2019-02-21 10:38:55 -07:00
Daniel Wozniak
c7136cbd3f
Merge pull request #51738 from garethgreenaway/nftables_cleanup
...
[2018.3] Nftables cleanup
2019-02-21 10:25:43 -07:00
Daniel Wozniak
21210492de
Merge pull request #51733 from s0undt3ch/features/nox-2018.3
...
[2018.3] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
2019-02-21 10:22:14 -07:00
Daniel Wozniak
9c128aaa71
Merge pull request #51732 from s0undt3ch/features/nox-2017.7
...
[2017.7] Add initial nox configuration. Tell `tox`'ers to use `nox`'.
2019-02-21 10:21:48 -07:00
Gareth J. Greenaway
8201d1e04f
Fixing lint.
2019-02-20 12:17:57 -08:00
Gareth J. Greenaway
d681064607
Merge branch '2018.3' into nftables_cleanup
2019-02-20 12:03:58 -08:00
Gareth J. Greenaway
e37458ee35
Fixing a couple tests.
2019-02-20 09:52:54 -08:00
Pedro Algarvio
f4adf33977
Merge pull request #51728 from gtmanfred/virtualnames
...
fix modulenames from virtualnames tests
2019-02-20 17:45:54 +00:00
Gareth J. Greenaway
ed1b743664
Additional cleanup. Adding additional documentation for state module.
2019-02-20 09:31:01 -08:00
Pedro Algarvio
328989d6cc
Add initial nox configuration. Tell tox'ers to use nox'.
2019-02-20 17:04:32 +00:00
Pedro Algarvio
97532c2a68
Add initial nox configuration. Tell tox'ers to use nox'.
2019-02-20 16:49:16 +00:00
Daniel Wallace
61b43905c2
fix modulenames from virtualnames tests
2019-02-20 08:06:29 -06:00
Assaf Shapira
895b97a295
Merge branch '2018.3' into 2018.3
2019-02-20 12:07:24 +02:00
Daniel Wozniak
d681fb9eb8
Merge pull request #51721 from dwoz/solarisipstests
...
[2018.3] Skip solarisips when not on solaris
2019-02-20 01:18:33 -07:00
Daniel A. Wozniak
3263d31592
Merge remote-tracking branch 'saltstack/2018.3' into solarisipstests
2019-02-20 01:17:36 -07:00
Daniel Wozniak
fb0a538d05
Merge pull request #51676 from Ch3LL/merge-2018.3.4
...
[2018.3] Merge forward from 2018.3.4 to 2018.3
2019-02-20 01:14:21 -07:00
Daniel Wozniak
8111479346
Merge branch '2018.3' into merge-2018.3.4
2019-02-20 01:13:19 -07:00
Daniel Wozniak
e08f08d46c
Merge pull request #50812 from gtmanfred/virtualnames
...
include the virtualname in the file name for core modules
2019-02-20 01:12:30 -07:00
Gareth J. Greenaway
dc4afbb8b4
More updates to nftables module, state modules, and unit tests.
2019-02-19 17:42:19 -08:00
Daniel A. Wozniak
9caafeca61
Skip solarisips when not on solaris
2019-02-19 16:59:10 -07:00
Daniel Wallace
d59952fce6
Merge branch '2018.3' into virtualnames
2019-02-19 16:59:42 -06:00
