96253 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	1552fba0bc	lint cleanup	2019-02-13 09:27:55 -08:00
Gareth J. Greenaway	086066b75f	Adding a test to ensure _get_schedule which is used by the save functionality works when there is an enabled attribute.	2019-02-13 09:27:55 -08:00
Gareth J. Greenaway	1c6d4fbc74	When looping through the schedule to remove hidden attributes, we should only do that if the item in question is a dictionary. It could be the attribute that determines if the entire scheudle is enabled or disable.	2019-02-13 09:27:55 -08:00
Daniel Wozniak	fdb13a3a91	Merge pull request #51523 from lomeroe/solarisips_fixes ... Bugfixes in solarisips	2019-02-13 01:14:45 -07:00
Daniel Wozniak	e3d5fbe947	Merge pull request #51577 from garethgreenaway/merge-2017.7 ... [2018.3] Merge forward from 2017.7 to 2018.3	2019-02-13 01:11:10 -07:00
Daniel Wozniak	5bb9b323fe	Merge pull request #51393 from garethgreenaway/various_documentation_fixes ... [2018.3] Various documentation fixes	2019-02-12 22:34:55 -07:00
Daniel Wozniak	884981f735	Merge pull request #51465 from ezh/50556 ... fix #50556 state.orchestrate_show_sls	2019-02-12 22:11:48 -07:00
Daniel Wozniak	e8e91e3b27	Merge branch '2018.3' into solarisips_fixes	2019-02-12 21:22:15 -07:00
Daniel Wozniak	231d6e2d39	Merge pull request #51541 from bdrung/silence-linux_distribution-deprecation-warning ... Silence linux_distribution deprecation warning	2019-02-12 21:18:01 -07:00
Daniel Wozniak	f87d5eccea	Merge pull request #51558 from bdrung/test-zypp-plugin ... Do not load zyppnotify file on module import	2019-02-12 21:16:34 -07:00
Daniel Wozniak	c34967dd22	Merge branch '2018.3' into test-zypp-plugin	2019-02-12 18:04:39 -07:00
Daniel Wozniak	c4feea1c7b	Merge branch '2018.3' into silence-linux_distribution-deprecation-warning	2019-02-12 18:00:12 -07:00
Daniel Wozniak	e060b979a4	Merge branch '2018.3' into merge-2017.7	2019-02-12 17:56:53 -07:00
Daniel Wozniak	edb1093bf9	Merge pull request #51609 from dwoz/wait_minions_2018.3 ... [2018.3] Wait for minions to be pingable before starting tests	2019-02-12 17:49:13 -07:00
Erik Johnson	8d79359e50	Merge pull request #51599 from terminalmage/bp-51510 ... Backport #51510 to 2018.3 branch	2019-02-12 15:24:30 -06:00
Erik Johnson	24aa083c65	Merge pull request #51598 from terminalmage/add-grain-option-documentation ... Add documentation for the metadata_server_grains config option	2019-02-12 15:23:36 -06:00
Daniel A. Wozniak	d794edb515	fix linter	2019-02-12 12:02:55 -07:00
Daniel A. Wozniak	d6720d2d14	Wait for minions to be pingable before starting tests	2019-02-12 12:02:48 -07:00
Gareth J. Greenaway	3eee0383c6	Fixing a couple issues that did not merge properly.	2019-02-12 09:34:03 -08:00
Gareth J. Greenaway	25b2ca677f	Merge branch '2018.3' into merge-2017.7	2019-02-12 09:30:04 -08:00
Dafydd Jones	ed194c7f3c	grains: assign os_family Debian to Debian derivative TurnKey Linux	2019-02-12 10:11:27 -06:00
Erik Johnson	4ee94409a1	Improve ec2 pillar documentation ... This also incorporates some docs proposed by @mr337 in #50860.	2019-02-12 09:12:40 -06:00
Erik Johnson	9c02104fea	Add link to metadata grain module docs	2019-02-12 09:01:19 -06:00
Erik Johnson	997ce2650c	Add documentation for the metadata_server_grains config option	2019-02-12 08:56:48 -06:00
Erik Johnson	d89c489e23	Merge pull request #51491 from terminalmage/issue51268 ... Don't log shell warning if output_loglevel is quiet	2019-02-12 08:22:55 -06:00
Benjamin Drung	7678c28be7	Do not load zyppnotify file on module import ... The call imp.load_source() could fail (i.e. when the specified zyppnotify does not exist). To prevent an import failure in that case, move the loading of the zyppnotify file into the test case. Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>	2019-02-12 11:25:24 +01:00
Benjamin Drung	e1dcbb541e	Silence linux_distribution deprecation warning ... The salt master log is flooded with deprecation warnings: ``` Feb 07 10:45:34 debian salt-master[1657]: [WARNING ] /usr/lib/python3/dist-packages/salt/grains/core.py:1759: DeprecationWarning: dist() and linux_distribution() functions are deprecated in Python 3.5 Feb 07 10:45:34 debian salt-master[1657]: linux_distribution(supported_dists=_supported_dists)] Feb 07 10:45:34 debian salt-master[1657]: [WARNING ] /usr/lib/python3/dist-packages/salt/grains/core.py:1759: DeprecationWarning: dist() and linux_distribution() functions are deprecated in Python 3.5 ``` Since the import statement already falls back to use distro.linux_distribution, silence the deprecation warning. Bug-Debian: https://bugs.debian.org/921630 Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>	2019-02-12 11:23:45 +01:00
Daniel Wozniak	c6dfded555	Merge pull request #51588 from dwoz/script_fix_2018.3 ... [2018.3] Use the code directory instead of cwd for python path	2019-02-11 19:56:49 -07:00
Daniel A. Wozniak	cbac390a7d	Use the code directory instead of cwd for python path	2019-02-11 17:13:07 -07:00
Gareth J. Greenaway	c337fcee4c	Merge branch '2018.3' into merge-2017.7	2019-02-11 14:51:33 -08:00
Gareth J. Greenaway	41e25a6627	Merge pull request #51580 from garethgreenaway/merge-2018.3.4 ... [2018.3] Merge forward from 2018.3.4 to 2018.3	2019-02-11 14:35:33 -08:00
Gareth J. Greenaway	84e15cedf9	Fixing lint	2019-02-11 10:57:08 -08:00
Gareth J. Greenaway	e891b3f515	Merge branch '2018.3.4' into merge-2018.3.4 ... Conflicts: tests/integration/states/test_file.py tests/unit/states/test_file.py tests/unit/utils/test_dns.py	2019-02-11 10:46:53 -08:00
Gareth J. Greenaway	f9d682851c	Fixing missed merge.	2019-02-11 09:32:40 -08:00
Gareth J. Greenaway	a04177518f	Merge branch '2017.7' into merge-2017.7 ... Conflicts: salt/modules/pillar.py salt/states/pip_state.py salt/utils/data.py tests/unit/modules/inspectlib/test_fsdb.py tests/unit/output/test_json_out.py tests/unit/test_test_module_names.py	2019-02-11 09:01:46 -08:00
Gareth J. Greenaway	61889ba934	Merge pull request #51452 from terminalmage/bp-50963 ... Backport #50963 to 2017.7	2019-02-11 08:10:08 -08:00
Daniel Wozniak	8bb7535888	Merge branch '2018.3' into various_documentation_fixes	2019-02-08 11:23:24 -07:00
Daniel Wozniak	f7d50b13b4	Merge pull request #50784 from sathieu/dynamic_file_roots ... Allow dynamic file_roots	2019-02-08 11:09:39 -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
lomeroe	b7bfe1766b	lint fixes	2019-02-07 10:52:41 -06:00
lomeroe	cdaccf4679	add tests to validate command being sent to cmd.run_all	2019-02-07 10:52:41 -06:00
lomeroe	eaa229dde5	add unit test	2019-02-07 10:52:41 -06:00
lomeroe	432428d833	Don't assume that each item in "pkgs" is a dict (as packed by ... pkg.installed state). Fixes #50874 Also, corrects an issue where a trailing space was added to package names when pkgs was passed as a dict (i.e. pkg.installed state)	2019-02-07 10:52:41 -06: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