92726 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	0b85d1273f	Merge pull request #47941 from terminalmage/salt-jenkins-1000 ... Update test logging for salt-jenkins	2018-06-02 21:40:55 -05:00
Erik Johnson	fb66368af9	Update test logging for salt-jenkins 1000	2018-06-02 21:39:17 -05:00
Nicole Thomas	58b5f2b4dd	Merge pull request #47924 from Ch3LL/mac_gitpy ... Catch all exceptions in git import for salt.utils.gitfs	2018-06-01 17:06:57 -04:00
Ch3LL	75c51ad69b	Catch all exceptions in git import for salt.utils.gitfs	2018-06-01 11:58:27 -04:00
Daniel Wallace	b88ec5258d	Merge pull request #47879 from dwoz/ami_role_fix ... Fix ami role usage warts #47269	2018-06-01 09:11:55 -05:00
Nicole Thomas	b09596982b	Merge pull request #47788 from twangboy/fix_47559 ... Use pytz to calculate timezones	2018-05-31 14:33:19 -04:00
Nicole Thomas	ae73cb3947	Merge pull request #47899 from terminalmage/salt-jenkins-1000 ... salt-jenkins issue 1000	2018-05-31 14:24:48 -04:00
Nicole Thomas	8f78e3aef6	Merge pull request #47753 from Ch3LL/service_mac ... Add stderr launchctl helper class and fix service mac tests	2018-05-31 14:16:57 -04:00
Nicole Thomas	828bf39695	Merge pull request #47908 from meaksh/2018.3-align-suse-salt-master-service ... Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt	2018-05-31 14:13:27 -04:00
Nicole Thomas	0d229c6182	Merge branch '2018.3' into fix_47559	2018-05-31 11:28:30 -04:00
Pablo Suárez Hernández	efe308013a	Align SUSE salt-master.service 'LimitNOFILES' limit with upstream Salt	2018-05-31 11:02:18 +01:00
twangboy	9e612ec9e7	Fix markup in release notes	2018-05-30 16:10:26 -06:00
Nicole Thomas	b4bac9b41b	Merge pull request #47868 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-30 17:20:37 -04:00
Ch3LL	185c9e9ae2	only stop service if its running	2018-05-30 15:35:05 -04:00
Ch3LL	e15e674955	Add stderr launchctl helper class and fix service mac tests	2018-05-30 15:30:24 -04:00
Nicole Thomas	21550dbd2d	Merge pull request #47900 from rallytime/merge-2018.3.1-to-2018.3 ... [2018.3] Merge forward from 2018.3.1 to 2018.3	2018-05-30 14:09:40 -04:00
rallytime	e5d386e91c	Update solaris core grains test ... The check for zpool grains was moved out of core grains and into zfs grains. The mock for the call to zpool grains function was failing. We also need to update any calls to the salt.utils file to use the new paths.	2018-05-30 13:50:22 -04:00
Nicole Thomas	a0bf565741	Merge pull request #47843 from garethgreenaway/30367_orch_return_false_when_function_fails ... [2018.3] orchestration results False when function is False	2018-05-30 13:21:53 -04:00
Erik Johnson	25afc932f7	WIP salt-jenkins issue 1000 ... This adds logging of the output and retcode when the output file fails to be created. As I have thus far been unable to reproduce this locally, this is the best shot at seeing what is causing the issue, since ShellCase's run_script is rather opaque about what happens in the script itself. We do know from the salt-runtests.log that the `salt-call -g` is successfully returning, what we don't know is what happened after that data was returned, and this should provide that insight.	2018-05-30 11:40:51 -05:00
rallytime	2801eecb26	Merge branch '2018.3.1' into '2018.3' ... No conflicts.	2018-05-30 11:14:40 -04:00
Nicole Thomas	ea7b4fdc08	Merge pull request #47897 from Ch3LL/rn_2018 ... Add changelog to 2018.3.1 release notes	2018-05-30 11:04:41 -04:00
Ch3LL	e27ee273a7	Add == line to changelog line for release notes	2018-05-30 10:51:12 -04:00
Ch3LL	61e56d275d	Add changelog to 2018.3.1 release notes	2018-05-30 10:49:30 -04:00
Nicole Thomas	09242697b8	Merge branch '2018.3' into 30367_orch_return_false_when_function_fails	2018-05-30 09:56:14 -04:00
Nicole Thomas	f15e636d5e	Merge pull request #47848 from twangboy/fix_47784 ... Fix some major issues with the LGPO module	2018-05-30 09:37:32 -04:00
Daniel Wallace	92b8c4c08e	Merge pull request #47881 from gtmanfred/2018.3.1 ... quote python_version in requirements.txt	2018-05-29 16:12:04 -05:00
Daniel Wallace	3d874b5529	quote python_version in requirements.txt	2018-05-29 16:08:58 -05:00
Daniel A. Wozniak	3884c2cf5f	Fix ami role usage warts #47269 ... Removing 3 un-needed encode calls. Requests Response.text is unicode, now that this file uses unicode_literals Response.text can by used without having to encode it.	2018-05-29 13:52:25 -07:00
Nicole Thomas	da6f7a5538	Merge pull request #47866 from rallytime/bp-47814 ... Back-port #47814 to 2018.3	2018-05-29 15:55:24 -04:00
Nicole Thomas	d9e7f2b5b1	Merge pull request #47865 from rallytime/bp-47600 ... Back-port #47600 to 2018.3	2018-05-29 15:54:43 -04:00
Nicole Thomas	705bf8172d	Merge pull request #47874 from gtmanfred/2018.3.1 ... Tornado 5.0 is only supported on python 2 for now	2018-05-29 15:45:43 -04:00
twangboy	98facf8dc8	Remove log.debug statement in __virtual__	2018-05-29 13:21:12 -06:00
Daniel Wallace	13f920415a	add tornado5 note to 2018.3.1	2018-05-29 14:01:54 -05:00
Daniel Wallace	aeacd2b749	allow tornado 5.0 to be installed only for python2	2018-05-29 14:01:18 -05:00
rallytime	267f09c1a0	Lint: Remove unused import	2018-05-29 13:56:15 -04:00
rallytime	120ee16b70	Replace old utils paths with new utils paths	2018-05-29 11:19:34 -04:00
rallytime	dc32b67c03	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/win_snmp.py - tests/integration/modules/test_saltutil.py - tests/integration/states/test_pkg.py - tests/support/helpers.py - tests/support/runtests.py - tests/unit/fileserver/test_gitfs.py - tests/whitelist.txt	2018-05-29 11:14:39 -04:00
Nicole Thomas	61561a8279	Merge pull request #47221 from azelezni/fix-boto_ec2-network_interfaces ... Fix boto_ec2 unused parameter "network_interfaces"	2018-05-29 10:41:34 -04:00
Travis Paul	d50c0ab96b	Lint test_pkgin.py	2018-05-29 10:10:43 -04:00
Travis Paul	4dac0b4a31	pkgin latest_version bugfix ... Handle case where the currently installed package is the latest	2018-05-29 10:10:43 -04:00
Travis Paul	4ae0313797	Bugfixes and unit tests for pkgin module ... Corrects pkg.lastest_version and pkg.file_dict behavior	2018-05-29 10:10:43 -04:00
Travis Paul	f9f464fa51	Prevent crash on NetBSD and OpenBSD when no swap is configured.	2018-05-29 10:03:49 -04:00
Daniel Wallace	4b28e510f1	Merge pull request #47853 from dwoz/py3-cloud-test ... Fix for py3 ec2 cloud tests	2018-05-28 18:08:08 -05:00
Gareth J. Greenaway	3e074be9c3	Fixing lint	2018-05-28 09:36:46 -07:00
Gareth J. Greenaway	02609b6e61	Adding state files for new test.	2018-05-28 09:36:46 -07:00
Gareth J. Greenaway	377e34c689	Updating function in saltmod to ensure that the result is a failure if the function being run returns as False.	2018-05-28 09:36:45 -07:00
Daniel A. Wozniak	c2f8aef7c5	Fix for py3 ec2 cloud tests	2018-05-27 14:09:50 -07:00
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