96244 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	c15406a919	Merge branch '2018.3' into various_documentation_fixes	2019-02-06 13:18:42 -07:00
Gareth J. Greenaway	5e840a54ac	Merge pull request #51527 from garethgreenaway/bp-51475 ... Back-port PR #51475 to 2018.3	2019-02-06 13:10:44 -07:00
Mike Place	801abf2c57	Fix Elasticsearch retuner ... The change db0135e297 did not allow the returner function to continue when the data key was not present. This made the Elasticsearch returner inoperable for most cases. Conflicts: salt/returners/elasticsearch_return.py	2019-02-06 20:12:05 +01: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
Gareth J. Greenaway	33bb4e454b	Merge branch '2018.3' into various_documentation_fixes	2019-02-06 10:50:09 -07: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	54d2e02fb1	Merge branch '2017.7' into bp-50963	2019-02-06 10:43:11 -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
Erik Johnson	550e9abfe7	Don't log shell warning if output_loglevel is quiet ... This will prevent grains generation from logging a bunch of these sort of warnings.	2019-02-04 09:57:09 -06:00
Erik Johnson	0c989f04f1	Merge pull request #51437 from twangboy/fix_raise_2017.7 ... Fix raise 2017.7	2019-02-04 09:29:57 -06: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
Thomas S Hatch	1f6da6a2b7	Merge pull request #50921 from terminalmage/issue49894 ... Add support for architectures for APT pkgrepo.managed states	2019-02-01 10:28:49 -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
Pedro Algarvio	3f177766d8	Actually, remove python-ldap. It needs system deps. Have salt-jenkins do it.	2019-02-01 16:36:25 +00:00
Pedro Algarvio	afcb6bdc84	Fix the ldap pacakge name in requirements/tests.txt	2019-02-01 16:22:43 +00:00
Erik Johnson	d06526c7a2	Allow for kwargs to be used in object initialization	2019-02-01 09:28:47 -06:00
Erik Johnson	0e760b59ba	pip states: Use case-insensitive dictionaries for pip.list return	2019-02-01 09:28:47 -06:00
Erik Johnson	5ca9f82ab5	Add a CaseInsensitiveDict implementation	2019-02-01 09:28:47 -06:00
Erik Johnson	2aaa9f9c95	pip.installed: Fix traceback when _find_key doesn't return a match	2019-02-01 09:28:44 -06:00
Erik Johnson	588cb8719c	Merge pull request #51454 from terminalmage/fix-deprecation-warning ... Fix deprecation warning in nested outputter	2019-02-01 09:26:27 -06:00
Anton Zhabolenko	f47dda61e6	Fix improper use of socket authentication in mysql.user_chpass	2019-02-01 16:52:52 +03:00
Alexey Aksenov	a3ee70ca3a	fix #50556 state.orchestrate_show_sls	2019-02-01 16:06:21 +03:00
Anton Zhabolenko	ed62a2f873	Fix insecure SQL queries in mysql.user_chpass	2019-02-01 13:07:25 +03:00
Erik Johnson	a35c023fdc	Don't use a decorator that assumes /etc/apt/sources.list.d exists ... This will make the test fail on most platforms	2019-01-31 19:47:11 -06: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	6a62e7912a	Add integration test for architecture support	2019-01-31 16:12:51 -06:00
Erik Johnson	67ae5a59a7	Add support for architectures for APT pkgrepo.managed states	2019-01-31 16:12:51 -06:00
Gareth J. Greenaway	3582f6e209	Fixing the underline.	2019-01-31 10:30:58 -08:00
Gareth J. Greenaway	a8f42a0d42	Various documentation fixes.	2019-01-31 10:30:57 -08:00
Erik Johnson	529cce0dba	Fix deprecation warning in nested outputter ... Pull request #50963 introduces a deprecation warning on later Python 3 releases, as the abstract base classes now live in `collections.abc`. This fixes that deprecation warning.	2019-01-31 10:21:42 -06: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
Erik Johnson	13de0b8f18	Merge pull request #50963 from terminalmage/issue50942 ... pip.installed: Fix traceback when _find_key doesn't return a match	2019-01-30 18:25:55 -06:00
Daniel Wozniak	ecd1637206	Merge branch '2017.7' into fix_raise_2017.7	2019-01-30 16:31:16 -07:00