85106 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Justin Findlay	2eef3c65a6	tests.unit.modules.gentoo_service add retcode arg	2018-02-19 11:27:11 -08:00
Justin Findlay	81ec66fd8b	modules.gentoo_service handle stopped retcode ... In OpenRC, when a service is stopped, the retcode of /sbin/openrc-run is 3, not 0.	2018-02-19 05:44:35 -08:00
Nicole Thomas	c3a938e994	Merge pull request #46070 from Ch3LL/fix-doc-dns ... add required arg to dns_check jinja doc example	2018-02-16 15:00:44 -05:00
Nicole Thomas	01042e9d77	Merge pull request #46067 from rallytime/bp-45994 ... Back-port #45994 to 2017.7	2018-02-16 14:55:26 -05:00
Ch3LL	2a5d855d97	add required arg to dns_check jinja doc example	2018-02-16 10:48:57 -05:00
Lee Webb	a07bb48726	Correct formatting for lint	2018-02-16 10:21:42 -05:00
Lee Webb	e8678f633d	Fix Comment being None not '' and inject quotes into the TXT ChangeRecords	2018-02-16 10:21:42 -05:00
Nicole Thomas	5e0e2a30e2	Merge pull request #45932 from The-Loeki/fix_cmd_run_all_bg ... Fix cmd run_all bg error	2018-02-16 09:53:14 -05:00
Nicole Thomas	45ace39961	Merge pull request #46062 from vutny/pg-user-state-fix-typo ... Fix typo in postgres_user.present state function	2018-02-16 09:44:28 -05:00
Denys Havrysh	a5fbe4e95e	Fix typo in postgres_user.present state function	2018-02-16 11:41:01 +02:00
Nicole Thomas	edcb64de76	Merge pull request #45763 from twangboy/win_fix_path_rehash ... Fix rehash function in win_path.py	2018-02-15 15:05:15 -05:00
Nicole Thomas	a46fbc546c	Merge pull request #46042 from jfindlay/file_tree_doc ... Revise file_tree pillar module documentation	2018-02-15 14:29:51 -05:00
Nicole Thomas	de86126dd8	Merge pull request #46013 from rallytime/bp-45598 ... Back-port #45598 to 2017.7	2018-02-15 11:11:04 -05:00
Justin Findlay	0ba4954a4b	salt.pillar.file_tree revise module documentation	2018-02-14 14:14:57 -08:00
Justin Findlay	3c6a5bf967	salt.pillar.file_tree provide better debug info	2018-02-14 14:14:51 -08:00
Justin Findlay	bb1cdc451e	salt.pillar.file_tree no stack trace when nodegroups undefined	2018-02-14 14:14:16 -08:00
Nicole Thomas	07e5735471	Merge pull request #46016 from rallytime/bp-45826 ... Back-port #45826 to 2017.7	2018-02-14 13:16:23 -05:00
Nicole Thomas	a1f4092811	Merge pull request #46015 from rallytime/bp-45785 ... Back-port #45785 to 2017.7	2018-02-14 13:16:08 -05:00
Nicole Thomas	96097c037e	Merge pull request #46012 from rallytime/bp-45462 ... Back-port #45462 to 2017.7	2018-02-14 13:14:55 -05:00
Nicole Thomas	1279924f5f	Merge pull request #45991 from terminalmage/fix-duplicate-extra-opts ... yumpkg: Fix a couple issues with _get_extra_opts	2018-02-14 11:48:28 -05:00
Erik Johnson	916766f651	yumpkg: Fix a couple issues with _get_extra_opts ... `_get_extra_opts()` and `_get_branch_option()` were unnecessarily quoting the value, causing it to be interpreted as a literal quote by `subprocess.Popen()`. Also, because there were separate helpers for repo options, disableexcludes, branch options, and extra options, and specifically because `_get_extra_opts()` parses *all* kwargs, any of the options from the other helper funcs would end up being added to the command line twice if `_get_extra_opts()` was used. This commit consolidates all of the kwarg inspection and CLI opts construction to a single helper function. It also adds unit tests to make sure that we are formatting our commands properly. Additionally, it makes a minor fix in `refresh_db()` which was not accounted for when we changed the osmajorrelease grain to an integer in 2017.7.0.	2018-02-13 22:46:27 -06:00
Nicole Thomas	8b9adc258e	Merge pull request #46017 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.3 to 2017.7	2018-02-13 16:43:14 -05:00
rallytime	a06645ce71	Merge branch '2017.7.3' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.4.rst - salt/utils/vault.py	2018-02-13 13:34:24 -05:00
Philippe Pepiot	1916e5c4a4	Fix selinux.fcontext_policy_present for Centos 6 ... 'a' is not a valid filetype for semanage on Centos 6. Since "a" (all files) is the default behavior of semanage, don't specify a `--ftype` when invoking semanage. Closes #45825	2018-02-13 13:30:43 -05:00
Ollie Armstrong	ef6ffb1492	Resolve linting errors	2018-02-13 13:27:38 -05:00
Ollie Armstrong	8047066c46	Remove unused import	2018-02-13 13:27:38 -05:00
Ollie Armstrong	8f7c45935a	Add tests for salt.modules.selinux.fcontext_get_policy	2018-02-13 13:27:38 -05:00
Ollie Armstrong	bafb7b4e6e	Ensure parsed fields are stripped	2018-02-13 13:27:38 -05:00
Ollie Armstrong	a830a6e819	m/selinux.fcontext_get_policy allow long filespecs ... The previous logic of matching the output of `semanage fcontext --list` did not allow for filespecs that were longer than 49 characters. This was due to the output of the semanage tool not conforming to the expected output. We used to expect that the after the filespec would be at least two spaces. However, with long filespecs there is only a single space separating it and the next field (the file type). This modifies the regular expression that we use to match the line to accept one or more spaces as field delimeters. However, this causes problems when we attempt to split the three fields into a python dictionary. We cannot use the same logic as previously of using the field delimeter as the file type field itself can contain a space. Instead we use a separate regular expression to parse the line into its component parts. Fixes #45784.	2018-02-13 13:27:38 -05:00
Lee Webb	2ea3fef543	No lazy logging	2018-02-13 13:24:04 -05:00
Lee Webb	f427b0febc	Change formatting style of logging lines per review	2018-02-13 13:23:59 -05:00
Lee Webb	ebb244396b	Patch around ResourceRecords needing to be present for AliasTarget entries to work	2018-02-13 13:23:49 -05:00
Jeremy McMillan	9f76836a6c	emit port cli version, variants as separate args	2018-02-13 13:19:24 -05:00
Nicole Thomas	d20ff89414	Merge pull request #45988 from rallytime/bp-45797 ... Back-port #45797 to 2017.7	2018-02-13 12:49:02 -05:00
Nicole Thomas	b18087cee0	Merge pull request #45711 from bdrung/fix-unicode-tests ... Fix Unicode tests when run with LC_ALL=POSIX	2018-02-13 12:42:06 -05:00
Nicole Thomas	5271fb1d40	Merge pull request #45878 from damon-atkins/2017.7_fix_ec2_pillar ... ec2_pillar update to fix finding instance-id	2018-02-13 12:34:13 -05:00
Nicole Thomas	6d534c6e7e	Merge pull request #46009 from Ch3LL/rn_7.4 ... Add 2017.7.4 Release Notes with PRs	2018-02-13 11:40:29 -05:00
Ch3LL	ac0baf4b34	Add 2017.7.4 Release Notes with PRs	2018-02-13 11:31:20 -05:00
Nicole Thomas	cf367dbd04	Merge pull request #45942 from terminalmage/issue45679-2017.7 ... Fix incorrect translation of docker port_bindings -> ports (2017.7 branch)	2018-02-13 11:10:02 -05:00
Nicole Thomas	ca76a0b328	Merge pull request #45981 from gtmanfred/2017.7.3 ... use local config for vault when masterless	2018-02-13 10:22:00 -05:00
Ronald van Zantvoort	f83da27ca5	Merge branch '2017.7' into fix_cmd_run_all_bg	2018-02-13 10:30:26 +01:00
Lars Wagner	953a400d79	follow symlinks	2018-02-12 17:21:38 -05:00
Nicole Thomas	dae41de7a8	Merge pull request #45959 from rallytime/state-doc-update ... A couple of grammar updates for the state compiler docs	2018-02-12 17:17:48 -05:00
Nicole Thomas	007214f7bf	Merge pull request #45908 from DimensionDataResearch/fix/issue/45884 ... Fix for #45884 ("TypeError: can't serialize <NodeImage" when calling salt-cloud with the dimensiondata driver)	2018-02-12 17:05:28 -05:00
Nicole Thomas	efcbfa868c	Merge pull request #45985 from garethgreenaway/2017_7_fixing_mac_tests_again ... [2017.7] Backport #45894 - Missing `format` in the call to write.	2018-02-12 15:22:30 -05:00
Daniel Wallace	0d448457dc	apparently local is not set by default	2018-02-12 12:53:59 -07:00
Gareth J. Greenaway	7b8dc14433	Missing format in the call to write.	2018-02-12 11:07:11 -08:00
Nicole Thomas	bf03abd07c	Merge pull request #45958 from garethgreenaway/backport-fixing_mactests_queue_full ... Backporting #45935 to 2017.7	2018-02-12 11:25:07 -05:00
Daniel Wallace	2a92f4bc16	use local config for vault when masterless	2018-02-12 09:16:38 -07:00
Damon Atkins	0e74025714	Merge branch '2017.7' into 2017.7_fix_ec2_pillar	2018-02-11 03:58:57 +11:00