85598 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	39d65a39cf	Merge pull request #46613 from myinitialsarepm/fix_puppet.fact_and_puppet.facts ... Fix puppet.fact and puppet.facts to use stdout.	2018-04-10 11:18:07 -04:00
Nicole Thomas	ba5421d988	Merge pull request #46991 from gtmanfred/windows ... use saltstack salt-jenkins	2018-04-10 10:18:59 -04:00
Daniel Wallace	98588c1dc5	use saltstack salt-jenkins	2018-04-10 09:15:50 -05:00
Nicole Thomas	00c4067585	Merge pull request #46975 from gtmanfred/windows ... Make windows work for test runs in jenkinsci	2018-04-10 09:41:17 -04:00
Peter Morris	44ecd13abc	Update tests to use cmd.run_all	2018-04-10 01:11:03 +01:00
Daniel Wallace	1f69c0d7f8	make sure windows outputs xml junit files	2018-04-09 14:43:15 -05:00
Daniel Wallace	4a2ec1bbb3	support new versions of winrm-fs	2018-04-09 12:12:14 -05:00
Nicole Thomas	7d7d40f541	Merge branch '2017.7' into fix_puppet.fact_and_puppet.facts	2018-04-09 09:18:24 -04:00
Nicole Thomas	3cf2353e41	Merge pull request #46945 from vutny/doc-faq-fix-jinja ... [DOC] Fix Jinja block in FAQ page	2018-04-09 09:05:27 -04:00
Denys Havrysh	bfdf54e61d	[DOC] Fix Jinja block in FAQ page ... Closes #18835	2018-04-08 12:19:48 +03:00
Nicole Thomas	fc2f728665	Merge pull request #46925 from terminalmage/fix-file.patch-docstring ... Remove reference to directory support in file.patch state	2018-04-06 09:54:46 -04:00
Nicole Thomas	eef6c518e1	Merge pull request #46900 from rallytime/bp-46801 ... Back-port #46801 to 2017.7	2018-04-06 09:47:43 -04:00
Nicole Thomas	71839b0303	Merge pull request #46899 from rallytime/bp-45116 ... Back-port #45116 to 2017.7	2018-04-06 09:47:16 -04:00
Erik Johnson	97695657f0	Remove reference to directory support in file.patch state ... The state was not written to support patching a directory, though the file.patch remote execution function does support patching a directory. This was likely just due to a careless copypasta from the remote execution function's docstring to the state function's.	2018-04-06 06:27:47 -05:00
yagnik	6a41e8b457	rename jenkins to jenkinsmod	2018-04-05 11:30:00 -04:00
Arif Ali	b92f908da4	fix adding parameters to http.query from sdb yaml	2018-04-05 11:27:33 -04:00
Nicole Thomas	d0f5b43753	Merge pull request #44926 from frogunder/whitelisted_acl ... whitelist_acl_test	2018-04-05 11:09:25 -04:00
Mike Place	7d822f9cec	Merge pull request #46464 from gtmanfred/orchestration ... fix salt subset in orchestrator	2018-04-05 09:52:00 -05:00
Mike Place	805ed1c964	Merge pull request #46879 from dwoz/cloudtestfix ... Fix multiple typos causing tests to fail	2018-04-05 08:59:28 -05:00
Nicole Thomas	18e460fc30	Merge branch '2017.7' into whitelisted_acl	2018-04-04 17:28:40 -04:00
Daniel A. Wozniak	dc54fc53c3	Fix multiple typos causing tests to fail	2018-04-04 14:20:51 -07:00
Nicole Thomas	f70f6de282	Merge pull request #46647 from twangboy/win_fix_test_grains ... Fix the tear down function in integration.modules.test_grains	2018-04-04 17:14:05 -04:00
Nicole Thomas	91c078ce12	Merge pull request #46756 from nages13/bugfix-grain-virtual_subtype ... fix grains['virtual_subtype'] to show Docker on xen kernels	2018-04-04 16:53:49 -04:00
Nicole Thomas	058bbed221	Merge pull request #46799 from garethgreenaway/46762_prereq_shenanigans_tests ... [2017.7] Adding test for PR #46788	2018-04-04 16:41:22 -04:00
Daniel Wallace	637cdc6b7b	fix pylint	2018-04-04 14:37:04 -05:00
Nageswar	781f5030a4	Merge branch 'bugfix-grain-virtual_subtype' of https://github.com/nages13/salt into bugfix-grain-virtual_subtype	2018-04-04 19:12:00 +00:00
Nageswar	7e704c0e81	Moved down container check code below hypervisors to validate containers type running in virtual environment. ... Fixes #46754 & #43405	2018-04-04 19:09:05 +00:00
Daniel Wallace	b9efec8526	remove libnacl on windows ... We do not use raet on windows, so we don't need to install it	2018-04-04 13:37:40 -05:00
Daniel Wallace	2edd5eaf9e	fix path	2018-04-04 13:37:39 -05:00
Daniel Wallace	b03e272e44	windows work	2018-04-04 13:37:39 -05:00
Nageswar	cd1ac4b7f9	Merge branch '2017.7' into bugfix-grain-virtual_subtype	2018-04-05 00:03:25 +05:30
Nicole Thomas	d9770bf3f8	Merge pull request #46867 from terminalmage/unicode-logging-normalization ... Backport string arg normalization to 2017.7 branch	2018-04-04 14:06:56 -04:00
Nicole Thomas	9eb98b1f6e	Merge pull request #46770 from twangboy/fix_46433 ... Change the order of SID Lookup	2018-04-04 13:33:09 -04:00
Erik Johnson	7652688e83	Backport string arg normalization to 2017.7 branch ... Prior to 2018.3 we were normalizing the format string to unicode but not the args. This means that even when a non-unicode format string was used, a str argument containing utf8-encoded non-ascii chars would result in a traceback. This backports the arg normalization from 2018.3 to to 2017.7 to ensure that these sort of cases do not cause errors in logging.	2018-04-04 09:25:38 -05:00
Nicole Thomas	9c776cffb7	Merge pull request #46839 from gtmanfred/tupletarget ... match tuple for targets as well	2018-04-04 10:07:11 -04:00
Nageswar	0ace76c0e7	Merge branch '2017.7' into bugfix-grain-virtual_subtype	2018-04-04 12:23:35 +05:30
Daniel Wallace	0151013ddb	document cli option for cmd_subset ... It would be really nice to have a better name for `cmd_cli` in a future release, possibly cmd_gen. I don't feel comfortable making this change in 2017.7 though	2018-04-03 15:13:00 -05:00
Daniel Wallace	4a3ed6607d	add test for subset in orchestration	2018-04-03 15:13:00 -05:00
Daniel Wallace	3112359dd6	fix salt subset in orchestrator	2018-04-03 15:13:00 -05:00
Nicole Thomas	7db251dc11	Merge pull request #46845 from rallytime/bp-46817 ... Back-port #46817 to 2017.7	2018-04-03 15:52:28 -04:00
Nicole Thomas	e3d17ab7bc	Merge pull request #46847 from dwoz/missing-strdup ... strdup from libc is not available on windows	2018-04-03 15:51:31 -04:00
Nicole Thomas	89af0a6222	Merge branch '2017.7' into fix_46433	2018-04-03 15:47:59 -04:00
Nicole Thomas	9eb6f5c0d0	Merge branch '2017.7' into bugfix-grain-virtual_subtype	2018-04-03 15:39:43 -04:00
Gareth J. Greenaway	13875e78cf	Fixing documention string for test.	2018-04-03 12:37:49 -07:00
Gareth J. Greenaway	3d288c44d4	Fixing test documentation	2018-04-03 12:37:49 -07:00
Gareth J. Greenaway	6cff02ef6a	Adding tests for #46788	2018-04-03 12:37:49 -07:00
Daniel A. Wozniak	55845f4846	strdup from libc is not available on windows	2018-04-03 11:01:02 -07:00
Matt Phillips	36a0f6d8ca	address filehandle/event leak in async run_job invocations ... extending on the idea used in #32145, when _check_pub_data is called it it will create jid subscriptions, regardless of whether anyone will ever come back to retrieve them; in the case of local_async calls noone ever does. In addition to the above, we use the listen kwarg provided by c59a5adb0d to know whether we need to subscribe to events in addition to ensuring the ioloop is listening before a call is made. This should fix #40245, #20639, #36374	2018-04-03 13:42:45 -04:00
Nicole Thomas	f2dd79f9c4	Merge pull request #46776 from gtmanfred/2017.7 ... fix shrinking list in for loop bug	2018-04-03 13:32:15 -04:00
Nicole Thomas	1941426218	Merge pull request #46838 from gtmanfred/npm ... use http registry for npm	2018-04-03 13:02:31 -04:00