96007 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	7376cb9151	Handle explicit lists properly	2019-02-12 14:38:20 -07:00
Megan Wilhite	d0cad3e5a3	Merge pull request #51553 from twangboy/update_libsodium ... Update url to libsodium for mac builds	2019-02-07 15:25:35 -05:00
Megan Wilhite	564a65a74e	Merge pull request #51544 from twangboy/fix_test_ssh_2018.3.4 ... Fix ssh on Windows (2018.3.4)	2019-02-07 15:24:17 -05:00
twangboy	4177f64f28	Update url to libsodium for mac builds	2019-02-07 12:52:44 -07:00
twangboy	7771632adc	Fix ssh on Windows	2019-02-07 10:07:01 -07:00
Megan Wilhite	b4299a3fa7	Merge pull request #51532 from frogunder/new_releasenotes ... Remove in progress from 2018.3.4 releasenotes	2019-02-07 11:55:37 -05:00
Megan Wilhite	c37bdb7f1c	Merge pull request #51534 from twangboy/fix_51309 ... Convert data to string using salt util	2019-02-07 11:49:26 -05:00
Megan Wilhite	09faf0bdaa	Merge branch '2018.3.4' into new_releasenotes	2019-02-07 11:46:00 -05:00
Megan Wilhite	5b41af3e66	Merge pull request #51530 from garethgreenaway/48204_mysql_module_handle_mariadb_versions ... [2018.3.4] Updating the mysql module to handle MariDB versions.	2019-02-07 11:41:24 -05:00
Gareth J. Greenaway	cdf52985ec	Later versions of MariaDB still support "ALL PRIVILEGES"	2019-02-07 11:19:02 +01:00
Gareth J. Greenaway	d31c902931	Updating the mysql module to handle MariDB versions.	2019-02-07 11:19:02 +01:00
twangboy	3ad95bcbac	Convert data to string using salt util	2019-02-06 15:50:45 -07:00
Frode Gundersen	c6bfe53e8b	2018.3.4 releasenotes	2019-02-06 22:29:56 +00:00
Megan Wilhite	f3f345c0cb	Merge pull request #51529 from frogunder/releasenotes ... 2018.3.4 releasenotes	2019-02-06 17:20:09 -05:00
Frode Gundersen	fb678ee990	fix escaped asterisks	2019-02-06 22:08:37 +00:00
Frode Gundersen	6a4f0da96b	2018.3.4 releasenotes	2019-02-06 21:10:51 +00:00
Gareth J. Greenaway	a37fb7d69d	Merge pull request #51525 from twangboy/backport_51095_2018.3.4 ... Backport 51095 to 2018.3.4	2019-02-06 13:20:36 -07:00
twangboy	b6acc92e87	Backport 51095	2019-02-06 11:58:57 -07:00
Megan Wilhite	602ddc8eb7	Merge pull request #51520 from frogunder/man_pages ... Update man pages for 2018.3.4	2019-02-06 13:42:12 -05:00
Daniel Wozniak	1f981c62ac	Merge pull request #51429 from yosnoop/replace-noclass-with-nocl-for-dig ... The +nocl is supported much wider than +noclass	2019-02-06 10:48:47 -07:00
Daniel Wozniak	209ef32049	Merge pull request #51441 from Ch3LL/bp-51366 ... Backport #51366 into 2018.3.4	2019-02-06 10:42:18 -07:00
Frode Gundersen	0cbe3f8bb5	Update man pages for 2018.3.4	2019-02-06 17:35:33 +00:00
Gareth J. Greenaway	90a868268d	Merge pull request #51458 from twangboy/add_py2_warning ... Add Py2 Warning for Py2 Installer	2019-02-06 10:33:01 -07:00
Gareth J. Greenaway	05522c0867	Merge branch '2018.3.4' into add_py2_warning	2019-02-06 10:31:56 -07:00
Gareth J. Greenaway	b49202173e	Merge pull request #51460 from twangboy/update_installer_mac_2018.3.4 ... Update installer mac 2018.3.4	2019-02-06 10:31:17 -07:00
Gareth J. Greenaway	3c92688b88	Merge branch '2018.3.4' into update_installer_mac_2018.3.4	2019-02-06 10:30:31 -07:00
Ty Hahn	5231e73559	Merge branch '2018.3.4' into replace-noclass-with-nocl-for-dig	2019-02-04 15:03:48 +09:00
Pedro Algarvio	892d98c43f	Merge pull request #51471 from twangboy/fix_test_win_dns_client ... Fix the failing dns test on Windows	2019-02-03 22:03:33 +00:00
Pedro Algarvio	c9f6b019cb	Merge branch '2018.3.4' into fix_test_win_dns_client	2019-02-03 22:03:20 +00:00
Ty Hahn	14e6fb758f	In case the test machine can't resolve ... With -v option, dig does not attemp to resolve while verifying all the given options.	2019-02-03 23:10:37 +09:00
Ty Hahn	95e8a2fdee	The +nocl is supported much wider than +noclass ... They are same options. in bin/dig/dig.c ... case 'l': /* class */ /* keep +cl for backwards compatibility */ FULLCHECK2("cl", "class"); lookup->noclass = !state; break; Seems the +nocl is introduced with tag v9_0_1 while +noclass is with tag v9_11_0. (the tag could be different with distribution's version) $ dig -v DiG 9.9.4-RedHat-9.9.4-73.el7_6 $ dig +nocl +short -t soa saltstack.com ns-39.awsdns-04.com. operations.saltstack.com. 1 7200 900 1209600 500 $ dig +noclass +short -t soa saltstack.com Invalid option: +noclass ...	2019-02-03 23:01:52 +09:00
Ty Hahn	a00d708441	Test dig options for salt.utils.dns.lookup	2019-02-03 23:01:39 +09:00
Daniel Wozniak	a05305dce3	Merge pull request #51462 from ShantonRU/fix-insecure-sql-queries-in-mysql-module-1 ... Fix insecure SQL queries in MySQL module	2019-02-01 14:19:19 -07:00
twangboy	33922c93c6	Fix the failing dns test on Windows ... Gets the name of the first interface on the system. Windows network interfaces don't have the same name across Window systems. YOu can even go as far as naming them whatever you want. The test was failing because the interface name was hard-coded as 'Ethernet'.	2019-02-01 13:52:39 -07:00
Anton Zhabolenko	d3ef2cb8e6	Merge branch '2018.3.4' into fix-insecure-sql-queries-in-mysql-module-1	2019-02-01 19:56:06 +03:00
Erik Johnson	48936c2283	Merge pull request #51445 from terminalmage/fix-custom-grains-traceback ... Remove custom grains module from 2018.3 branch	2019-02-01 10:48:12 -06:00
Anton Zhabolenko	f47dda61e6	Fix improper use of socket authentication in mysql.user_chpass	2019-02-01 16:52:52 +03:00
Anton Zhabolenko	ed62a2f873	Fix insecure SQL queries in mysql.user_chpass	2019-02-01 13:07:25 +03:00
twangboy	72fd1a2991	Roll back icon change	2019-01-31 17:56:16 -07:00
twangboy	7dd1704132	Add welcome_py2.rtf	2019-01-31 17:50:11 -07:00
twangboy	c93e9e39b9	Add Py2 Warning to installer package	2019-01-31 17:48:10 -07:00
twangboy	b658900c01	Add Py2 Warning for Py2 Installer	2019-01-31 15:53:31 -07:00
Erik Johnson	191235d8d3	Remove custom grains module from 2018.3 branch ... Support for passing the grains data to custom grains modules wasn't added until the 2019.2 release cycle. It seems like this file was included when something else was backported to 2018.3.	2019-01-31 09:10:45 -06:00
Daniel A. Wozniak	5bc466e5e4	Fix python 3 path for shell test cases	2019-01-30 17:05:17 -05:00
Daniel A. Wozniak	5351e5c459	Add testing path to run_script commands	2019-01-30 17:05:10 -05:00
Daniel A. Wozniak	2d8a3641bc	Fix linter issues	2019-01-30 17:05:03 -05:00
Daniel A. Wozniak	9b8718a1d5	Cloud provider and profile configs are merged	2019-01-30 17:04:50 -05:00
Daniel Wozniak	a880e422ec	Merge pull request #51438 from twangboy/fix_raise_2018.3.4 ... Add missing raise statement	2019-01-30 13:04:04 -07:00
twangboy	5830fad5b4	Add missing raise statement	2019-01-30 11:26:46 -07:00
Daniel Wozniak	28b898c54b	Merge pull request #51432 from Ch3LL/bp-51324 ... Backport #51324 into 2018.3.4	2019-01-30 10:51:49 -07:00