92615 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	c4d828c986	Merge pull request #47850 from rallytime/swarm-autodoc ... Fix autodoc for new swarm module	2018-05-25 20:53:16 -05:00
Nicole Thomas	30b31c5db5	Merge pull request #47800 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-25 21:17:40 -04:00
rallytime	467c8fa45c	Fix autodoc for new swarm module ... A misspelling of "members" was causing the docs for the swarm module to not build. This change also fixes a bunch of formatting for RST, a handful of other misspellings, and some small code clean-up. The docs should be building for the swarm execution module with the appropriate doc and CLI example formatting.	2018-05-25 21:07:51 -04:00
Nicole Thomas	da9eaa1825	Merge pull request #47581 from twangboy/fix_47274 ... Add get_encoding salt util	2018-05-25 16:40:06 -04:00
Nicole Thomas	b860d95b2c	Merge pull request #47726 from gtmanfred/2018.3 ... rename boto to botomod	2018-05-25 16:37:36 -04:00
rallytime	9e3ce39e8c	Typo: test_type --> text_type	2018-05-25 16:10:52 -04:00
rallytime	8877489386	Fix bad merge caught by test in zpool state ... Also fix up some of the comment formatting	2018-05-25 10:47:33 -04:00
Nicole Thomas	ff6600f25e	Merge branch '2018.3' into fix_47274	2018-05-24 12:47:29 -04:00
Nicole Thomas	2a270162d0	Merge pull request #47803 from rallytime/bp-47703 ... Back-port #47703 to 2018.3	2018-05-23 16:12:30 -04:00
Nicole Thomas	780043e6fd	Merge pull request #47804 from rallytime/bp-47761 ... Back-port #47761 to 2018.3	2018-05-23 16:11:54 -04:00
twangboy	6eff2f847b	Add suggested changes	2018-05-23 13:34:33 -06:00
Lior Goikhburg	b7bc306333	Fix userdata in openstack instances	2018-05-23 13:09:15 -04:00
Damien Degois	8fce0c562d	Fix elasticsearch with check_definition	2018-05-23 13:07:42 -04:00
rallytime	c328450be2	Update old utils paths to new paths	2018-05-23 12:35:47 -04:00
rallytime	4abfd26e86	Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/dev_python27.txt - requirements/dev_python34.txt - salt/fileclient.py - salt/output/__init__.py - salt/serializers/configparser.py - salt/states/pkg.py - salt/states/zpool.py - salt/transport/tcp.py - tests/integration/cloud/providers/test_ec2.py - tests/integration/modules/test_mac_user.py - tests/integration/modules/test_pip.py - tests/integration/modules/test_pkg.py - tests/integration/modules/test_service.py - tests/integration/states/test_pip_state.py - tests/integration/states/test_user.py - tests/unit/modules/test_cmdmod.py	2018-05-23 12:33:00 -04:00
Nicole Thomas	1efe891c42	Merge pull request #47776 from garethgreenaway/970_two_minion_unit_tests_failing ... [2018.3] Fixes to failing _before_connect tests	2018-05-23 11:10:34 -04:00
Nicole Thomas	4a6ca67883	Merge pull request #47783 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.1 to 2018.3	2018-05-23 10:51:55 -04:00
Nicole Thomas	46618d2ce7	Merge pull request #47765 from meaksh/2017.7-fix-zypper-error-reading-repo ... Prevent zypper from parsing repo configuration from not .repo files	2018-05-23 10:45:03 -04:00
Nicole Thomas	0e87559ee3	Merge pull request #47781 from rallytime/update-linode-sizes ... Update cloud test profile and docs to use new Linode size lables	2018-05-23 09:09:12 -04:00
Gareth J. Greenaway	a5011b49ab	Merge branch '2018.3' into 970_two_minion_unit_tests_failing	2018-05-22 14:41:10 -07:00
Nicole Thomas	f8a6a85d28	Merge pull request #47149 from meaksh/2018.3-remove-trailing-commas-on-linux-user-gecos-fields ... [2018.3] Strip trailing commas on Linux user's GECOS fields	2018-05-22 17:18:48 -04:00
rallytime	1adb8ea27f	Merge branch '2018.3.1' into '2018.3' ... No conflicts.	2018-05-22 17:14:31 -04:00
Nicole Thomas	9c610da0bc	Merge pull request #47782 from rallytime/bp-47775 ... Back-port #47775 to 2018.3.1	2018-05-22 16:56:36 -04:00
Nicole Thomas	3ddc56cb9b	Merge pull request #47748 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.6 to 2017.7	2018-05-22 16:53:01 -04:00
Daniel Wozniak	0ddc864f90	Merge pull request #47779 from dwoz/winrmtests ... Increase ec2 cloud timeouts to 1000	2018-05-22 13:35:44 -07:00
Daniel A. Wozniak	d5eafe9d53	Use common timeout variable	2018-05-22 13:27:26 -07:00
Daniel Wallace	bab9c966c5	catch UnsupportedOperation with AssertionError	2018-05-22 16:13:08 -04:00
rallytime	a90c1b760e	Update cloud test profile and docs to use new Linode size lables ... Linode changed their size labels recently, so the cloud test profile and the docs need to be updated accordingly. The new sizes can be found by running `salt-cloud --list-sizes <my-linode-config>`. For example, the `Linode 2048` size is now `Linode 2GB`.	2018-05-22 16:00:39 -04:00
Daniel A. Wozniak	7e948eb540	Increase ec2 cloud timeouts to 1000	2018-05-22 12:23:31 -07:00
Gareth J. Greenaway	ef24f72169	Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect.	2018-05-22 12:12:49 -07:00
rallytime	b75f5ae38e	Merge branch '2017.7.6' into '2017.7' ... No conflicts.	2018-05-22 15:10:49 -04:00
Nicole Thomas	edf94c915e	Merge pull request #47775 from gtmanfred/2017.7.6 ... catch UnsupportedOperation with AssertionError	2018-05-22 15:04:12 -04:00
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
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	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
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
Daniel Wallace	3cfb95c7bc	skip test that breaks test suite	2018-05-22 09:34:53 -04:00
Nicole Thomas	12b330f049	Merge pull request #47749 from terminalmage/issue47717 ... Fix "dnf list upgrades" parsing	2018-05-22 08:51:28 -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
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