98251 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	46c0e50638	Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/man/salt.7	2018-10-03 09:45:20 -04:00
Nicole Thomas	47838dfcde	Merge pull request #49871 from garethgreenaway/1134_scheduler_tests_failing_osx ... [fluorine] Updating scheduler tests for OS X	2018-10-03 09:31:17 -04:00
Nicole Thomas	05cd56b476	Merge pull request #49867 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-10-03 09:23:34 -04:00
Daniel Wallace	42b540bab4	Merge pull request #49876 from KaiSforza/ci_actually_fail_2018 ... Actually catch the exception when we fail	2018-10-03 07:26:57 -05:00
William Giokas	c88a81d059	Actually catch the exception when we fail ... This should actually cause builds to fail when any part in the try block fails. We still delete instances and try junit rendering, but if things fail then they get marked on github as failed.	2018-10-03 14:18:43 +02:00
Gareth J. Greenaway	76f9e4877a	Fixing lint	2018-10-02 15:53:28 -07:00
Gareth J. Greenaway	200e0ea1cf	Updating various scheduler tests to ensure they're passing on OS X	2018-10-02 14:53:46 -07:00
rallytime	b53c3e695a	Update old utils paths to use new utils paths	2018-10-02 15:12:58 -04:00
rallytime	a65c60d862	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/state.py - salt/utils/hashutils.py - tests/integration/modules/test_state.py	2018-10-02 15:09:51 -04:00
Nicole Thomas	7fa20430f7	Merge pull request #49858 from Paulo-Nunes/fix-requisite-doc ... Edit requisite documentation	2018-10-02 13:57:47 -04:00
Nicole Thomas	a2b726a3dd	Merge pull request #49854 from terminalmage/salt-jenkins-1133 ... Replace hanging shell integration test with better one	2018-10-02 13:43:55 -04:00
Nicole Thomas	1c8def9641	Merge pull request #49852 from terminalmage/issue49627 ... Rename logstash engine filename to make it work with the loader	2018-10-02 13:42:09 -04:00
Nicole Thomas	675df255ca	Merge pull request #49850 from rallytime/bp-49798 ... Back-port #49798 to 2018.3	2018-10-02 13:40:28 -04:00
Nicole Thomas	b534485aa7	Merge pull request #49856 from gtmanfred/proxy ... Fix values in proxy caller tests	2018-10-02 13:39:41 -04:00
Erik Johnson	108c026e1d	Fix additional references to Fluorine in matcher docs	2018-10-02 11:53:13 -05:00
C. R. Oldham	853740d00b	Change versionadded to Neon	2018-10-02 11:49:40 -05:00
Erik Johnson	92ce6be011	lint	2018-10-02 08:34:45 -05:00
Paulo-Nunes	fb6f81835a	Edit requisite documentation ... Fixes #49836	2018-10-01 21:08:49 -04:00
Daniel Wallace	40c6b9d50e	Merge branch 'fluorine' into proxy	2018-10-01 17:05:39 -05:00
Daniel Wallace	ea939d96d7	Fix values in proxy caller tests ... These numbers were wrong because of the bug fixed in #49552 Fixes saltstack/salt-jenkins#1135	2018-10-01 16:55:26 -05:00
Nicole Thomas	93d064add1	Merge pull request #49846 from rallytime/bp-49650 ... Back-port #49650 and #49827 to 2018.3	2018-10-01 16:05:24 -04:00
Erik Johnson	b3c14e5b14	Replace hanging shell integration test with better one	2018-10-01 13:51:33 -05:00
Erik Johnson	559cf1b874	Rename logstash engine filename to make it work with the loader	2018-10-01 11:22:59 -05:00
Daniel Wozniak	0587fbc5fd	Merge pull request #49828 from dwoz/testslogencoding ... Use utf-8 encoding for salt-runtests.log	2018-10-01 07:54:22 -07:00
Matt Phillips	4b6dcd78ca	saltnado: teach runner about full_return ... runnerclient sync interface allows for a full_return kwarg to exist outside of the low to flag when the full event body is wanted with metadata instead of just the inner result. Since saltnado only uses the async interface we teach it about the sync wrapper about this kwarg.	2018-10-01 10:47:44 -04:00
Nicole Thomas	ec978061aa	Merge pull request #49764 from garethgreenaway/49520_multimaster_dns_issue_fix ... [2018.3] Adding retry_dns_count to minion	2018-10-01 10:20:02 -04:00
Nicole Thomas	abdab68ca9	Merge pull request #49847 from terminalmage/fix-version-rst-2018.3 ... Fix badly formatted versionadded directive (2018.3 branch)	2018-10-01 10:04:26 -04:00
Nicole Thomas	15ccffdf70	Merge pull request #49848 from terminalmage/fix-version-rst-2017.7 ... Fix badly formatted versionadded directive (2017.7 branch)	2018-10-01 10:04:08 -04:00
Erik Johnson	af2dddb4e3	Fix badly formatted versionadded directive ... A space here will cause the Sphinx role to treat whatever is after the comma as the comment for the directive, so it will be rendered with different CSS and look weird. Also, this fixes one syntactically incorrect versionadded which included a typo.	2018-10-01 08:58:06 -05:00
Erik Johnson	a1275483f7	Fix badly formatted versionadded directive ... A space here will cause the Sphinx role to treat whatever is after the comma as the comment for the directive, so it will be rendered with different CSS and look weird.	2018-10-01 08:54:31 -05:00
Nicole Thomas	aca87abe40	Merge pull request #49782 from dwoz/issue-49043 ... Fix issue 49043	2018-10-01 09:43:01 -04:00
Nicole Thomas	1a41d1b7b5	Merge pull request #49820 from garethgreenaway/49671_fixing_vault_pillar ... [2018.3] Fixing vault when being used from Pillar	2018-10-01 09:40:24 -04:00
dmorris	fb7fed71d9	referncing #49204, fixing mis-spelling of lattrs on line 4514 per request from @gtmanfred	2018-10-01 09:34:19 -04:00
Yxn	ec9fa92f66	use stringutils instead of hard code	2018-10-01 09:32:19 -04:00
Yxn	a307ae093f	fix aliyun cloud typeerror	2018-10-01 09:32:14 -04:00
Nicole Thomas	bf9c175522	Merge pull request #49842 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.3 to 2018.3	2018-10-01 09:21:41 -04:00
rallytime	81b0aa7099	Add "in progress" notation back to the 2018.3.3 release notes ... This has been removed in the 2018.3.3 branch for release prep, but the docs on the main website still need to say this is in progress until we release.	2018-10-01 09:17:50 -04:00
Nicole Thomas	c6846c7f87	Merge pull request #49841 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-10-01 09:15:39 -04:00
Nicole Thomas	297031b042	Merge pull request #49777 from terminalmage/issue49738 ... Fix parallel states with long ID dec or name	2018-09-30 14:46:02 -04:00
Nicole Thomas	a57872fdc7	Merge branch '2018.3' into 49671_fixing_vault_pillar	2018-09-30 14:38:50 -04:00
Nicole Thomas	2b323df453	Merge branch '2017.7' into testslogencoding	2018-09-30 14:37:40 -04:00
Nicole Thomas	98c9372de7	Merge pull request #49763 from twangboy/fix_49730 ... Add ability to clear DNS entries on static DNS	2018-09-30 14:36:40 -04:00
rallytime	0e761036f1	Merge branch '2018.3.3' into '2018.3' ... No conflicts.	2018-09-30 12:39:44 -04:00
rallytime	dbbfb0d2d4	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/minion.py - salt/utils/data.py	2018-09-30 12:36:52 -04:00
Nicole Thomas	30ccc5e369	Merge branch '2018.3' into 49520_multimaster_dns_issue_fix	2018-09-30 12:34:55 -04:00
Nicole Thomas	e6382cbf8e	Merge pull request #49839 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-30 12:32:52 -04:00
Mike Place	99bc8f11c1	Merge branch '2017.7' into fix_49730	2018-09-30 09:24:54 -05:00
Mike Place	b7d904f4bb	Merge branch '2018.3' into issue-49043	2018-09-30 09:18:54 -05:00
rallytime	179e4b1866	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-09-30 07:19:09 -04:00
Nicole Thomas	fd46d35a55	Merge pull request #49823 from dubb-b/timeout_addition ... Adding timeout to all pipelines so that the build aborts	2018-09-30 07:17:27 -04:00