91932 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	7d045eb235	Fix decorator wart	2018-04-24 19:09:08 -07:00
Daniel Wozniak	da532aa1ac	Merge pull request #47285 from dwoz/core_test_fix ... Fix reg grains test	2018-04-24 17:16:55 -07:00
Daniel Wozniak	f591cff643	Merge pull request #47290 from dwoz/test_cp_fix ... Run cache_master test in tmp dir	2018-04-24 16:37:20 -07:00
Daniel A. Wozniak	884f4c1829	Fix extra space	2018-04-24 16:15:11 -07:00
Daniel A Wozniak	8a9027c0c9	Fix reg grains test	2018-04-24 15:05:43 -07:00
Daniel A. Wozniak	5ff51affbd	Run cache_master test in tmp dir	2018-04-24 14:58:20 -07:00
Nicole Thomas	6d323aa8f0	Merge pull request #47250 from terminalmage/issue47092 ... Fix virtual package detection	2018-04-24 15:22:23 -04:00
Nicole Thomas	428e915d6a	Merge pull request #47228 from pruiz/pruiz/zfs-dataset-present-slow-2018.3 ... Fix issue #47225: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (2018.3 branch)	2018-04-24 09:35:20 -04:00
Nicole Thomas	0b836106b9	Merge pull request #47262 from garethgreenaway/slack_engine_target_fix ... [2018.3] Fixes to targeting in Slack engine	2018-04-24 09:18:35 -04:00
Gareth J. Greenaway	bcdef641e8	Removing target and tgt_type from the cmdline that is passed along to Salt, the target is used else where and including it in the cmdline causes problem when it is passed along. Adding an additional test to ensure we are getting the right targt.	2018-04-23 20:14:51 -07:00
Mike Place	2ed4b38b02	Merge pull request #47142 from garethgreenaway/47047_passing_pillar_to_slack_aliases ... [2018.3] pillar and output formatting fixes to Slack engine	2018-04-23 13:55:06 -06:00
Erik Johnson	b8630a70be	Fix virtual package detection ... Virtual package detection was broken in #44455. This restores it for the remainder of the 2018.3 release cycle, at which time it will be removed altogether.	2018-04-23 14:31:21 -05:00
Pablo Ruiz	cfbf136ab2	Fix issue #47225: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots	2018-04-23 20:47:39 +02:00
Nicole Thomas	42a0e655dc	Merge pull request #47245 from terminalmage/zeromq-bytes ... Ensure we pass hexid as bytes when zmq_filtering enabled	2018-04-23 12:54:57 -04:00
Nicole Thomas	73525d1460	Merge pull request #47242 from aesposito91/2018.3 ... PY3 fix for zeromq setsockopt	2018-04-23 12:38:09 -04:00
Nicole Thomas	b78295aee9	Merge pull request #47241 from cloudflare/fix-47117 ... Fix the imports into the netacl execution and state modules	2018-04-23 10:56:31 -04:00
Nicole Thomas	88557ea991	Merge pull request #47219 from garethgreenaway/vault_backward_compatibility ... [2018.3] Fixing a backward compatibility issue with vault module & runner	2018-04-23 10:10:18 -04:00
Nicole Thomas	370feadbd2	Merge pull request #47186 from dmurphy18/zfs_backport_46933 ... backport of issue 46933, updated ZFS handling to Salt 2018.3.x	2018-04-23 10:07:05 -04:00
Erik Johnson	a7accc0548	Ensure we pass hexid as bytes when zmq_filtering enabled ... When using hashlib and running `.hexdigest()`, a `str` type is returned. It needs to be converted to a bytes type for the setsockopt a few lines below, if zmq_filtering is enabled and the master is running Python 3.	2018-04-23 08:47:59 -05:00
Nicole Thomas	bf3a67d11b	Merge pull request #47217 from twangboy/fix_setup ... Remove installation of pywin32 from setup.py	2018-04-23 09:32:53 -04:00
aesposito91	b225351e6d	Update napalm_syslog.py	2018-04-23 08:51:14 -04:00
Mircea Ulinic	26c5583264	#47117: fix the napalm imports in the netacl state module	2018-04-23 12:41:23 +01:00
Mircea Ulinic	48396467c1	#47117: fix the napalm imports in the netacl execution module	2018-04-23 12:40:35 +01:00
Gareth J. Greenaway	1758081ffe	When using the vault module on a 2018.3 minion against a 2017.7 master, the 2018.3 minion is expecting a verify element in the results from the Salt runner on the master. The runner in 2017.7 did not include a verify element, which results in an error. This change accounts for this by using the default in 2018.3 which is not to verify if not configured.	2018-04-20 18:25:45 -07:00
twangboy	eb3d45bb08	Remove installation of pywin32 from setup.py ... This keeps regressing for some reason. This is the 3rd time I've had to fix this... I believe	2018-04-20 15:05:51 -06:00
Nicole Thomas	8e21703f13	Merge pull request #47195 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-20 15:25:29 -04:00
Nicole Thomas	a56eb7e05d	Merge pull request #47168 from gtmanfred/metadata ... fix metadata grain for py3 and windows	2018-04-20 15:07:49 -04:00
rallytime	f90fd8c663	Test fix: file strings must be unicode in master config	2018-04-20 15:04:54 -04:00
Daniel Wallace	396f7906e3	fix metadata grain for py3 and windows ... Fixes #47168	2018-04-20 09:52:06 -05:00
Nicole Thomas	6135b76e2c	Merge pull request #47202 from cloudflare/fix-46918 ... Fix #46918: add the TTL field	2018-04-20 10:34:08 -04:00
Nicole Thomas	7f1115e611	Merge pull request #47191 from terminalmage/issue47150 ... salt-ssh: Do not attempt to match host/ip to minion ID if reverse lookup fails	2018-04-20 10:20:04 -04:00
rallytime	bee4948df1	Lint: use full path for event utils function	2018-04-20 09:35:33 -04:00
Mircea Ulinic	1e74141cc0	Fix #46918	2018-04-20 13:04:16 +01:00
Gareth J. Greenaway	6f183e1d80	Initial commmit for unit/engines/test_slack_engine	2018-04-19 18:29:49 -07:00
Gareth J. Greenaway	a2840fc230	Only include the rest of the cmdline if the cmd is an alias.	2018-04-19 18:29:49 -07:00
Gareth J. Greenaway	e846df7409	Fixing a bug when passing pillar values to aliases for the Slack engine. Cleaned up the formatting of the results, color codes don't translate well into Slack output. For any state runs, eg. highstate. apply, sls, we run the output through the highstate formater. For anything else run it though the yaml outputer. Running it though highstate causes errors when the output does match what the highstate output is expecting.	2018-04-19 18:29:48 -07:00
rallytime	120c5446b7	Update old utils paths to new utils paths	2018-04-19 17:25:55 -04:00
rallytime	4718d31e53	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/config/__init__.py - salt/minion.py - salt/modules/pip.py - salt/states/pip_state.py - salt/states/virtualenv_mod.py - tests/integration/modules/test_status.py	2018-04-19 17:15:20 -04:00
Nicole Thomas	1947ffdf56	Merge pull request #47122 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-19 16:44:17 -04:00
Erik Johnson	95a6f075cb	Add debug logging when ip_to_host fails	2018-04-19 14:40:19 -05:00
Nicole Thomas	65f344e371	Merge pull request #47184 from Ch3LL/status_test ... Add status module integration modules tests for Windows	2018-04-19 15:38:55 -04:00
Nicole Thomas	965600ad6c	Merge pull request #47163 from rallytime/jenkins-autodoc ... Updage jenkins module autodocs to use jenkinsmod name instead	2018-04-19 15:34:59 -04:00
Nicole Thomas	291cca7ed8	Merge pull request #47162 from terminalmage/bp-47161 ... Partial backport of #47161 to 2018.3 branch	2018-04-19 15:28:46 -04:00
Erik Johnson	45696e622b	salt-ssh: Do not attempt to match host/ip to minion ID if reverse lookup fails ... When the reverse lookup fails, `salt.utils.network.ip_to_host()` returns `None`. Later, when we attempt to look through the roster(s) for a minion ID matching the target's host, a roster entry without a `host` key will mean that `roster_data.get('host')` evaluates as None. This causes the target expression to be expanded as `None`, when what we should do is simply carry on without attempting to find a match in the roster(s). This commit does just that.	2018-04-19 14:27:39 -05:00
David Murphy	283359d315	Corrected typo in comma-seprated and 2018.3.0 -> 2018.3.1	2018-04-19 13:20:40 -06:00
David Murphy	b7f8d5a22f	Replace use of Fluorine with 2018.3.0 for comma-separated warnings	2018-04-19 13:14:57 -06:00
Nicole Thomas	0a43dde5fc	Merge pull request #47185 from twangboy/add_tests ... Add additional integration tests to whitelist	2018-04-19 14:20:24 -04:00
David Murphy	3f30ab2ed6	ZFS backport of 46933 to 2018.3.1	2018-04-19 12:08:58 -06:00
Daniel Wozniak	1a600bb9a4	Merge pull request #47172 from dwoz/cover_without_admin ... Allow non admin name based runs on windows	2018-04-19 10:26:41 -07:00
twangboy	345daa0423	Add additional integration tests to whitelist	2018-04-19 10:52:14 -06:00