91191 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	0411845cec	Update the merge-forward docs to reference the 2018.3 branch ... This will make the docs for 2018.3.x more coherent once the docs for 2018.3 are pushed live.	2018-03-05 10:04:30 -06:00
Nicole Thomas	a8f2f1b063	Merge pull request #46322 from terminalmage/issue44935 ... yamlify_arg: don't treat leading dashes as lists	2018-03-05 10:40:16 -05:00
Nicole Thomas	da5c282cb2	Merge pull request #46327 from samilaine/fix-vmware-cloud-fqdn ... Modify the way a FQDN is handled in the vmware cloud provider.	2018-03-05 10:35:37 -05:00
Nicole Thomas	78c45d3786	Merge pull request #46318 from terminalmage/squelch-warnings ... Skip type-checking for several gitfs/git_pillar/winrepo params	2018-03-05 10:04:26 -05:00
Nicole Thomas	bb0d6fc263	Merge pull request #46312 from gtmanfred/2017.7 ... add module_dirs to salt ssh thin tarball	2018-03-05 10:00:47 -05:00
Nicole Thomas	88b5f7383d	Merge pull request #46242 from redbaron4/fix-46127 ... Pass env_vars to pip.freeze	2018-03-05 09:53:12 -05:00
Sami Laine	4b8dfb326f	Modify the way a FQDN is handled in the vmware cloud provider.	2018-03-05 11:09:34 +02:00
Erik Johnson	85ac6a9893	yamlify_arg: don't treat leading dashes as lists ... We had a similar check to ensure "foo: bar" isn't loaded as a dict, this adds a check to ensure that we only load lists when there is a leading bracket.	2018-03-03 15:02:12 -06:00
Nicole Thomas	c389995a5c	Merge pull request #46317 from terminalmage/grains-unicode ... Ensure strings in grains are unicode	2018-03-03 13:37:03 -05:00
Nicole Thomas	241611aca5	Merge pull request #46307 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.0rc1 to 2018.3	2018-03-03 07:56:06 -05:00
Nicole Thomas	30c34f0c62	Merge pull request #46314 from terminalmage/merge-2017.7-2018.3 ... Merge 2017.7 branch into 2018.3	2018-03-03 07:54:26 -05:00
Erik Johnson	5889b36646	Skip type-checking for several gitfs/git_pillar/winrepo params ... In some edge cases, the branch/directory paths used here could have values loaded as int/float/etc., which is not a problem for salt.utils.gitfs since it normalizes these values to strings. Therefore, this commit removes them from VALID_OPTS so that we skip type-checking to avoid spurious warnings in the log file.	2018-03-02 20:41:29 -06:00
Erik Johnson	d56daa8b61	Ensure strings in grains are unicode	2018-03-02 19:53:53 -06:00
Erik Johnson	61ab47ee70	Merge branch '2017.7' into merge-2017.7-2018.3 ... Conflicts: - salt/cloud/clouds/openstack.py - salt/daemons/masterapi.py - salt/master.py - salt/modules/gentoo_service.py - salt/pillar/__init__.py - salt/pillar/git_pillar.py - salt/runners/cache.py - salt/runners/git_pillar.py - salt/runners/winrepo.py - salt/utils/docker/__init__.py - salt/utils/gitfs.py	2018-03-02 16:20:20 -06:00
Nicole Thomas	a0716643e4	Merge pull request #46265 from Ch3LL/profit_cloud ... Add username/password to profitbricks conf for cloud tests	2018-03-02 16:40:21 -05:00
Nicole Thomas	194b0317ac	Merge pull request #46287 from bbinet/upstream-pillarstack ... Update PillarStack stack.py to latest upstream version	2018-03-02 16:39:51 -05:00
Nicole Thomas	ed7bffa7e0	Merge pull request #46306 from rallytime/bp-46256 ... Back-port #46256 to 2017.7	2018-03-02 16:37:26 -05:00
Daniel Wallace	749ae580ed	add module_dirs to salt ssh thin tarball ... Fixes #45535	2018-03-02 14:16:05 -07:00
rallytime	c9fa21f62c	Merge branch '2018.3.0rc1' into '2018.3' ... No conflicts.	2018-03-02 14:22:07 -05:00
Nicole Thomas	8c2c4e3316	Merge pull request #46208 from terminalmage/audit-umask-usage ... Blacklist os.umask	2018-03-02 13:46:06 -05:00
rallytime	6439bce4a8	Don't install msgpack 0.5.5 ... This version has known critical issues. See da902f9c1d (r27725642) for more information.	2018-03-02 13:39:33 -05:00
Nicole Thomas	5ffa482343	Merge pull request #46285 from gtmanfred/2018.3.0rc1 ... fix return dict for salt-ssh if something goes wrong	2018-03-02 12:17:42 -05:00
Nicole Thomas	5416fcf6dc	Merge pull request #46275 from terminalmage/issue46274 ... Make sure rest_cherrypy's config is all str types on PY2	2018-03-02 12:15:33 -05:00
Erik Johnson	aeeb533225	Fix master conf test for PY3 ... PY3 should have no non-unicode strings, this was a bug in the test	2018-03-02 11:06:13 -06:00
Nicole Thomas	978e869490	Merge pull request #46293 from eliasp/2017.7-44624-py3-compat ... Fix Python3 comparison `TypeError` in `salt.modules.upstart`	2018-03-02 11:36:09 -05:00
Nicole Thomas	00ca4f01c1	Merge pull request #46269 from DSRCorporation/bugs/46202_msgpack_custom_types_rework ... msgpack custom types rework	2018-03-02 11:22:55 -05:00
Daniel Wallace	417e45686b	add unit test	2018-03-02 07:48:26 -07:00
Nicole Thomas	cfbead0fc7	Merge pull request #46262 from The-Loeki/fix_sysctl ... sysctl.set can still not set unicode sysctl keys	2018-03-02 09:34:12 -05:00
Nicole Thomas	bee4a66d0c	Merge pull request #46264 from terminalmage/issue46128 ... Fix incorrect merge conflict resolution	2018-03-02 09:21:12 -05:00
Nicole Thomas	1e0b3aa348	Merge pull request #46296 from vutny/doc-pillar-get ... [DOC] Add missing params to `pillar.get` docstring	2018-03-02 09:19:40 -05:00
Elias Probst	2e08b0d9c8	Fix Python3 comparison TypeError in salt.modules.upstart ... Use `len()` to determine emptiness of a dictionary. PR#44624 introduced a Python3 incompatible comparison where a dict is compared against an integer, causing breakage on Ubuntu 18.04/bionic which uses Python3 by default for SaltStack: ``` File "/usr/lib/python3/dist-packages/salt/modules/upstart.py", line 100, in _find_utmp if result > 0: TypeError: '>' not supported between instances of 'dict' and 'int' ```	2018-03-02 14:42:05 +01:00
Denys Havrysh	1faa8331e1	[DOC] Add missing params to pillar.get docstring	2018-03-02 14:15:00 +02:00
Dmitry Kuzmenko	2f2464b64d	Fix long int support for older msgpack versions.	2018-03-02 11:03:42 +03:00
Dmitry Kuzmenko	51c311bc1c	Payload Py3 fix and set handling.	2018-03-02 06:01:42 +03:00
Erik Johnson	d29d2fa074	Fix incorrect invocation of salt.config.include_config ... This was causing exit_on_config_errors to not be passed through, and adding an `exit_on_config_errors` key to the master config.	2018-03-01 13:43:41 -06:00
Erik Johnson	2f7ae45088	Add conf file unicode test for master	2018-03-01 13:43:33 -06:00
Ronald van Zantvoort	2bf834bc28	Merge branch '2018.3.0rc1' into fix_sysctl	2018-03-01 20:42:54 +01:00
Nicole Thomas	c490a50452	Merge pull request #45874 from GwiYeong/2017.7-local-client-hotfix ... fix for local client timeout bug	2018-03-01 14:39:35 -05:00
Ch3LL	b9e0f0d565	Ensure minion id is unicode when minion_id_caching is set	2018-03-01 13:13:52 -06:00
Erik Johnson	4a738bfa63	Make sure rest_cherrypy's config is all str types on PY2 ... CherryPy is not unicode-compatible.	2018-03-01 12:42:41 -06:00
Erik Johnson	9c92aadce8	Disable blacklisted-function check for legitimate uses	2018-03-01 12:17:39 -06:00
Nicole Thomas	8e8a3a2897	Merge pull request #46261 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2018-03-01 12:55:22 -05:00
Bruno Binet	b14b6f2c95	Update PillarStack stack.py to latest upstream version ... which provide the following fixes/enhancements: - https://github.com/bbinet/pillarstack/pull/37 - https://github.com/bbinet/pillarstack/pull/39 - https://github.com/bbinet/pillarstack/pull/42	2018-03-01 18:07:38 +01:00
Daniel Wallace	de762765e5	fix return dict for salt-ssh if something goes wrong ... If we are unable to login go the minion, the return will not be a dictionary, it will be a string. We should still return this, but it needs to be in the correct format.	2018-03-01 09:51:07 -07:00
Ronald van Zantvoort	d6da2b62fe	the curious case of the missing comma	2018-03-01 17:45:12 +01:00
Nicole Thomas	dc2833aa87	Merge branch '2018.3.0rc1' into bugs/46202_msgpack_custom_types_rework	2018-03-01 10:47:07 -05:00
Nicole Thomas	88a3166589	Merge pull request #46276 from terminalmage/issue44046 ... salt.utils.docker.translate_input: operate on deepcopy of kwargs	2018-03-01 10:37:43 -05:00
Nicole Thomas	fb978c0e16	Merge pull request #46278 from dincamihai/2018.3.0rc1 ... Fix grains with '\n'	2018-03-01 10:32:24 -05:00
Mike Place	f3e9e824de	Merge pull request #46267 from garethgreenaway/filter_hidden_schedule_option ... [2018.3.0rc1] Don't include internal schedule options	2018-03-01 05:33:05 -07:00
Mihai Dinca	0eb03496eb	Fix grains with '\n'	2018-03-01 11:17:24 +01:00