92786 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	9923176b68	Use __utils__, fix unit tests	2018-05-23 17:27:58 -06:00
Daniel A. Wozniak	a056a293f1	Centeralize test username lookup	2018-05-23 16:16:35 -07:00
Daniel A Wozniak	6a6ab69722	Get the current username on windows	2018-05-23 16:16:32 -07:00
twangboy	73e033f555	Return offset in the same format as Unix	2018-05-23 15:00:09 -06:00
twangboy	5656183c5e	Add timezone.list, add 2018.3.2 release notes	2018-05-23 14:18:30 -06: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	81308a4a44	Add release notes for 2017.7.7	2018-05-23 13:47:08 -06:00
Nicole Thomas	2cb6634c6b	Merge pull request #47773 from frogunder/45011 ... add win_servermanager.list_available test	2018-05-23 15:44:13 -04:00
Nicole Thomas	e65dece202	Merge pull request #47807 from dwoz/winrmtests ... Try an even bigger timeout	2018-05-23 15:38:20 -04:00
Daniel A. Wozniak	1f1cc1357a	Increase instance size for cloud tests	2018-05-23 12:35:57 -07:00
twangboy	6eff2f847b	Add suggested changes	2018-05-23 13:34:33 -06:00
Daniel A. Wozniak	be8dcd21f1	Try an even bigger timeout	2018-05-23 11:08:14 -07:00
twangboy	66d8b0331a	Add sign.bat script for signing packages	2018-05-23 11:20:51 -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
Steven Joseph	bb357da084	add minion function to reload beacon #35960	2018-05-23 13:05:22 -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	7e314c26c8	Merge pull request #47798 from rallytime/bp-47776 ... Back-port #47776 to 2018.3.1	2018-05-23 11:10:42 -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
Gareth J. Greenaway	ae881547d2	Fixing unit.test_minion.MinionTestCase.test_beacons_before_connect and unit.test_minion.MinionTestCase.test_scheduler_before_connect.	2018-05-23 11:02:38 -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
twangboy	986f6c9b2a	Use pytz to calculate timezones	2018-05-22 18:26:39 -06: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
Ch3LL	f8c467d3e6	Fix text editor error	2018-05-22 15:19:51 -04: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
Ch3LL	872e162137	Add test_pkg integration state tests to windows	2018-05-22 15:11:14 -04: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