94449 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	43997a466e	fix tests	2018-05-22 12:49:47 -05:00
Daniel Wallace	59180e09a8	switch all salt.utils.boto* calls to __utils__ calls	2018-05-22 12:49:47 -05:00
Daniel Wallace	7e30f459c9	rename boto to botomod	2018-05-22 12:49:47 -05:00
Daniel Wallace	548f65d056	catch UnsupportedOperation with AssertionError	2018-05-22 12:43:16 -05:00
Nicole Thomas	4adf10b20b	Merge pull request #47770 from rallytime/bp-47769 ... Back-port #47769 to 2018.3.1	2018-05-22 13:27:19 -04:00
Nicole Thomas	60ec3230db	Merge branch '2018.3' into 2018.3-remove-trailing-commas-on-linux-user-gecos-fields	2018-05-22 11:35:20 -04:00
rallytime	17596f3025	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-22 11:26:44 -04:00
nicholasmhughes	d8479177be	fixes #47096 serialization error on event firing for bootstrap	2018-05-22 11:13:31 -04:00
Nicole Thomas	8c38ecd75f	Merge pull request #47769 from gtmanfred/2017.7.6 ... skip test that breaks test suite	2018-05-22 11:12:53 -04:00
Nicole Thomas	de84f6fbd6	Merge pull request #47256 from weswhet/add-mac_service-update ... add macOS mac_service update.	2018-05-22 11:03:20 -04:00
Nicole Thomas	a59147c104	Merge branch 'develop' into ipaclient-group-auth-with-stringutils-support	2018-05-22 10:54:36 -04:00
Nicole Thomas	17c4c8443c	Merge pull request #47430 from baniobloom/vpc_association_not_found ... Add catch for VPCAssociationNotFound	2018-05-22 10:54:00 -04:00
Nicole Thomas	9c5dde1449	Merge pull request #47525 from baniobloom/duplicate_sec_group_rule ... Trying to add a duplicate sec group rule true	2018-05-22 10:51:08 -04:00
Nicole Thomas	910cc0856b	Merge pull request #47613 from baniobloom/auto_assign_public_ipv4 ... added auto_assign_public_ipv4 option to state subnet_present	2018-05-22 10:39:54 -04:00
Nicole Thomas	256ad14251	Merge pull request #47712 from slaws/vault-json-write ... Add write_raw method to vault module	2018-05-22 10:38:42 -04:00
Nicole Thomas	61a16a9dcd	Merge pull request #47624 from terminalmage/deprecate-sdecode ... Replace salt.utils.locales.sdecode with salt.utils.data.decode	2018-05-22 10:37:48 -04:00
Daniel Wallace	536ce2fa42	Merge pull request #47772 from gtmanfred/2017.7 ... lock down dependencies for kitchen-salt	2018-05-22 09:21:48 -05:00
Daniel Wallace	67756a50fd	lock down dependencies for kitchen-salt	2018-05-22 09:20:29 -05:00
Nicole Thomas	9ed105d451	Merge pull request #47761 from zerthimon/develop ... Fix userdata in openstack instances	2018-05-22 09:46:08 -04:00
Daniel Wallace	3cfb95c7bc	skip test that breaks test suite	2018-05-22 09:34:53 -04:00
Dmitry Kuzmenko	6f27ea9e31	Fixed lint error.	2018-05-22 16:10:07 +03:00
Nicole Thomas	12b330f049	Merge pull request #47749 from terminalmage/issue47717 ... Fix "dnf list upgrades" parsing	2018-05-22 08:51:28 -04:00
Nicole Thomas	70b62074b5	Merge pull request #47609 from rrroo/improve-aws-retries ... Unify retries for AWS API	2018-05-22 08:50:03 -04:00
Pablo Suárez Hernández	4475ba19b8	Prevent zypper from parsing repo configuration from not .repo files	2018-05-22 12:04:48 +01:00
Lior Goikhburg	615a4b9115	Fix userdata in openstack instances	2018-05-22 12:56:54 +03:00
rrroo	26cfd62d69	Improve formatting	2018-05-22 09:45:36 +02:00
Daniel Wallace	3fdfc0fa82	skip test that breaks test suite	2018-05-21 17:42:35 -05:00
Daniel Wozniak	5cd18b9e70	Merge pull request #47755 from dwoz/winrmtests ... Be explicit about winrm setting	2018-05-21 15:39:23 -07:00
Daniel A. Wozniak	57dd89e6c3	Default to ec2 classic compatible images	2018-05-21 15:01:27 -07:00
Daniel A. Wozniak	f89668920a	Be explicit about winrm setting	2018-05-21 14:29:17 -07:00
Nicole Thomas	f45a96ba1d	Merge pull request #47668 from Ch3LL/win_pkg_test ... Add pkg.latest_version windows test	2018-05-21 16:26:44 -04:00
Nicole Thomas	4da4560b71	Merge pull request #47731 from rallytime/lxc-state-warning ... Remove deprecation warning until #35523 is resolved	2018-05-21 15:04:20 -04:00
Nicole Thomas	7b12444dfa	Merge pull request #47750 from dwoz/cloudtest ... Allow ssh_interface to default to public_ips	2018-05-21 13:14:10 -04:00
Daniel A. Wozniak	63b722ba21	Allow ssh_interface to default to public_ips	2018-05-21 09:30:45 -07:00
Nicole Thomas	bbe8e62a98	Merge pull request #47724 from terminalmage/master_tops_fixes ... 2 master_tops/ext_nodes fixes	2018-05-21 11:59:03 -04:00
Nicole Thomas	97d6fe7434	Merge pull request #47739 from rallytime/bp-47702 ... Back-port #47702 to 2018.3.1	2018-05-21 11:37:02 -04:00
Nicole Thomas	cfbe0ba73e	Merge pull request #47730 from rallytime/bp-47700 ... Back-port #47700 to 2018.3.1	2018-05-21 11:36:15 -04:00
Gareth J. Greenaway	48b8c5acd1	Merge branch '2018.3.1' into master_tops_fixes	2018-05-21 08:32:54 -07:00
Nicole Thomas	44e9e53db0	Merge pull request #47679 from onlyanegg/slsutil-merge_all ... Adding a merge_all function to slsutil	2018-05-21 10:59:21 -04:00
Erik Johnson	cd484bef69	Fix "dnf list upgrades" parsing ... The header for the output of this command appears to have changed at some point, which breaks our output parsing. This adds the new header to the `_strip_headers()` helper so that we ignore it while parsing.	2018-05-21 09:49:08 -05:00
rallytime	e458f4a031	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-21 10:34:10 -04:00
rallytime	3d0f71b3d2	Remove deprecation warning until #35523 is resolved ... Refs #35523 I discussed this issue with @terminalmage offline, but basically this function was marked for deprecation a very long time ago and we cannot fully remove the function and complete the deprecation process until issue #35523 is resolved. Instead of just continually bumping the deprecation version, the warning has been removed from the code, but the warning about the function's bug remains in the documentation. Once we have more resources to dedicate to this issue, the documentation warning can suffice.	2018-05-21 10:27:51 -04:00
Nicole Thomas	0d5b473ce2	Merge pull request #47747 from Ch3LL/rn_2017.7.6 ... Add changelog to 2017.7.6 release notes	2018-05-21 10:24:59 -04:00
Nicole Thomas	27fbb42210	Merge pull request #47737 from dwoz/win_timeout ... Cloud test fixup	2018-05-21 10:19:48 -04:00
Ch3LL	d4aa83b92d	Add changelog to 2017.7.6 release notes	2018-05-21 10:01:00 -04:00
rallytime	f79da64bb0	Update is_windows path to use platform	2018-05-21 09:59:08 -04:00
Nicole Thomas	19f4137b63	Merge pull request #47740 from garethgreenaway/46938_beacons_documentation ... [2018.3] Updating Beacon topic to include list based configuration for Beacons	2018-05-21 09:58:00 -04:00
Nicole Thomas	3614d3d83a	Merge pull request #47727 from Ch3LL/spelling ... Fix salt.utils.versions.warn_until spelling	2018-05-21 09:40:59 -04:00
Nicole Thomas	bb45cdaefe	Merge pull request #47736 from Ch3LL/fix_util_mac_test ... mac_utils test: patch __salt__['cmd.run*']	2018-05-21 09:38:58 -04:00
Daniel A. Wozniak	e88833a07d	Cloud test fixup ... - Increase winrm timeout - Ignore winrm tests when dependencies are missing	2018-05-20 01:24:03 -07:00