85200 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	d2196b6df3	Update release versions for the 2016.11 branch	2018-02-21 06:37:18 -05:00
Nicole Thomas	16c382b55b	Merge pull request #46121 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2018-02-21 05:07:17 -05:00
Nicole Thomas	b92346645b	Merge pull request #46107 from amendlik/yumpkg-assumeyes ... Add --assumeyes on YUM/DNF commands	2018-02-20 17:52:05 -05:00
rallytime	4c2f504a85	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-02-20 17:43:33 -05:00
Ollie Armstrong	2a2c23c66b	Fix acme state to correctly return on test ... Previously, the acme.cert state would return that a change was pending during a test run even in the case that the certificate would not have been touched. Changed the return value in this case so that it is not thought to require a change. This is reported in #40208 [0] and is also referenced in #42763 [1]. The issue #40208 looks to go on to recommend further changes beyond the scope of this 'quick fix'. [0] https://github.com/saltstack/salt/issues/40208#issuecomment-289637588 [1] https://github.com/saltstack/salt/issues/42763#issuecomment-345728031	2018-02-20 16:50:50 -05:00
Nicole Thomas	e197a0fbc5	Merge pull request #46076 from rallytime/bp-46066 ... Back-port #46066 to 2016.11	2018-02-20 16:48:41 -05:00
Nicole Thomas	14fe423e0c	Merge pull request #46094 from kstreee/fix-memory-leak ... Fix memory leak	2018-02-20 16:36:01 -05:00
Nicole Thomas	c72c1bde5f	Merge pull request #46093 from wedge-jarrad/contributing-doc-typo ... Fix contributing doc typo	2018-02-20 12:37:27 -05:00
Nicole Thomas	320c2037e1	Merge pull request #46097 from vutny/fix-https-link ... [DOC] Put https link to the formulas doc page	2018-02-20 12:07:38 -05:00
Nicole Thomas	0eb137fb4e	Merge pull request #46103 from bdrung/2017.7 ... Fix skipping Kubernetes tests if client is not installed	2018-02-20 11:33:41 -05:00
Adam Mendlik	8d9a432fb2	Add --assumeyes to yum/dnf commands in yumpkg.refresh_db ... Without --assumeyes, these commands can hang waiting for user confirmation if there is an unaccepted repository key.	2018-02-19 17:51:11 -07:00
Benjamin Drung	dd3f936557	Fix skipping Kubernetes tests if client is not installed ... When the Kubernetes client is not installed, the import of salt.modules.kubernetes will still succeed, but HAS_LIBS will be set to False (since the library import will be covered by a try-except clause). Therefore expect the salt.modules.kubernetes to always succeed and check kubernetes.HAS_LIBS instead for the presence of the kubernetes library. Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2018-02-19 12:32:14 +01:00
Denys Havrysh	2062fd0e5c	[DOC] Put https link to the formulas doc page	2018-02-19 12:59:00 +02:00
gwiyeong	48080a1bae	Fixes memory leak, saltclients should be cleaned after used.	2018-02-19 16:31:32 +09:00
gwiyeong	aba00805f4	Adds set_close_callback function to removes stream instance after closed from a set streams.	2018-02-19 14:44:49 +09:00
Wedge Jarrad	5a0fe104f7	Fix contributing doc typo	2018-02-18 10:57:28 -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
rallytime	b94d73c53e	Pin tornado version in requirements file ... tornado needs to be >= 4.2.1, but less that 5.0. Tornado 5.0 is introducing backwards-incompatible changes. Therefore, we need to pin the version of tornado in base.txt until we can fix supporting Tornado 5.0 in Salt. Refs #45790	2018-02-16 12:05:18 -05:00
Nicole Thomas	b5b083fd26	Merge pull request #46074 from Ch3LL/update-7.4 ... Update 2017.7.4 Release Notes with new fixes	2018-02-16 11:47:55 -05:00
Ch3LL	8d0eeeb059	Update 2017.7.4 Release Notes with new fixes	2018-02-16 11:45:49 -05:00
Erik Johnson	32f3d00e44	Merge pull request #46066 from rallytime/pin-tornado ... Pin tornado version in requirements file	2018-02-16 10:40:04 -06: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
rallytime	6dc1a3b9dc	Pin tornado version in requirements file ... tornado needs to be >= 4.2.1, but less that 5.0. Tornado 5.0 is introducing backwards-incompatible changes. Therefore, we need to pin the version of tornado in base.txt until we can fix supporting Tornado 5.0 in Salt. Refs #45790	2018-02-16 09:02:36 -05:00
Nicole Thomas	85761ee650	Merge pull request #46036 from terminalmage/issue43769 ... git.latest: Fix regression with identity file usage	2018-02-16 08:57:22 -05:00
Denys Havrysh	a5fbe4e95e	Fix typo in postgres_user.present state function	2018-02-16 11:41:01 +02:00
Erik Johnson	e2140d9a84	Mock the ssh.key_is_encrypted utils func	2018-02-15 14:37:50 -06: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	3cb83ea87e	Merge pull request #45992 from bgridley/fix-routes-present-state ... Add vpc_peering_connection_id to describe_route_tables route_keys	2018-02-15 13:56:55 -05:00
Erik Johnson	169924b3fe	Move ssh.key_is_encrypted to a utils module temporarily ... This allows us to expose the needed functionality to Windows in the meantime while we work to get salt/modules/ssh.py importing on Windows for the Fluorine release.	2018-02-15 12:23:32 -06:00
twangboy	54f4d78f7a	Only keep ssh.py in the Windows installer	2018-02-15 11:43:33 -06:00
twangboy	5f04531e1b	Keep ssh state and execution modules in the installer	2018-02-15 11:43:11 -06: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
Erik Johnson	f2b69f703d	git.latest: Fix regression with identity file usage ... Unit test included	2018-02-15 09:35:10 -06: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
Nicole Thomas	8a60635da0	Merge pull request #46000 from terminalmage/issue45910 ... salt.states.reg.present: Prevent traceback when reg data is binary	2018-02-14 10:55:41 -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
Erik Johnson	8cf13325ee	salt.states.reg.present: Prevent traceback when reg data is binary ... This prevents a failed decode of undecodable data from resulting in a traceback by catching the exception and just using the original value in the changes dict.	2018-02-13 16:23:55 -06:00
Nicole Thomas	1f44e285dc	Merge pull request #46011 from terminalmage/fix-solaris-runas ... cmdmod.py: runas workaround for platforms that don't set a USER env var	2018-02-13 17:03:10 -05:00