90735 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	e6c9740a7d	Gating nacl tests to ensure libnacl is installed.	2018-03-08 10:06:58 -08:00
Gareth J. Greenaway	4ae2861d68	Fixing a few bugs introducted following the move to unicode all the things. Adding deprecation notices for the previously used key and key_file arguments. Adding deprecation into Release notes. Adding some tests for Naccl module and runner to test encryption and decryption.	2018-03-08 10:06:55 -08:00
Nicole Thomas	c5aa1ca47b	Merge pull request #46393 from gtmanfred/vault ... make vault like all other sdb backends	2018-03-08 09:28:54 -05:00
Nicole Thomas	eff652104d	Merge pull request #46399 from twangboy/win_fix_reg ... Fix reg module when vname=None	2018-03-08 09:27:11 -05:00
Nicole Thomas	7523f5dcb0	Merge pull request #46400 from gtmanfred/openstack ... add waiting for metadata	2018-03-08 09:26:00 -05:00
Daniel Wallace	ca67fdf09f	add waiting for metadata ... This is needed for rackspace managed cloud and rackconnect v2	2018-03-07 08:27:47 -07:00
Nicole Thomas	79f72f99f4	Merge pull request #46355 from gtmanfred/2018.3.0rc1 ... Add docs for oxygen and deprecation warnings for openstack	2018-03-06 15:05:50 -05:00
twangboy	e2bfb848b1	Remove vdata check for none ... This was moved to the _to_unicode function	2018-03-06 12:30:10 -07:00
twangboy	498a2c6873	Add comment on None Statement	2018-03-06 12:19:59 -07:00
twangboy	76f273bfc8	Move None check to _to_mbcs function	2018-03-06 12:17:43 -07:00
twangboy	917ce07eb0	Fix reg.py for None values ... Fixes problem when vdata or vname is None and it tried to convert None to unicode. Uses win32con values	2018-03-06 12:05:00 -07:00
Daniel Wallace	0511c4c10c	make vault like all other sdb backends	2018-03-06 10:08:41 -07:00
Daniel Wallace	a67b61eb33	fix pylint	2018-03-06 07:47:38 -07:00
Nicole Thomas	4daa5bcdc4	Merge pull request #46344 from dwoz/salt-jenkins-branch ... Update salt-jenkins branch in kitchen config	2018-03-06 08:55:28 -05:00
Daniel Wallace	ac4133f432	Add getting started openstack doc	2018-03-05 16:25:08 -07:00
Daniel Wallace	537bc589b1	add auth type for openstack + rackspace	2018-03-05 16:14:41 -07:00
Daniel Wallace	5eff6f73e4	Add notes about the openstack revamp ... Also note that the old openstack modules are being deprecated.	2018-03-05 16:04:59 -07:00
Daniel A. Wozniak	51b0e54ffe	Update salt-jenkins branch in kitchen config	2018-03-05 15:58:48 -07: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
Erik Johnson	d56daa8b61	Ensure strings in grains are unicode	2018-03-02 19:53:53 -06: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	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
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
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
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	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
Dmitry Kuzmenko	a664864ab1	Rework msgpack serialization of unsupported types in serial	2018-03-01 02:16:31 +03:00
Nicole Thomas	c862b4bf00	Merge pull request #46256 from rallytime/msgpack-python-0.5.5 ... Don't install msgpack 0.5.5	2018-02-28 17:51:29 -05:00
Gareth J. Greenaway	ca4bc3fe29	Filter out the internal schedule options when persisting the schedule to disk. Some of these are "special" types and do not represent when when written out, eg. datetime objects. Also ensuring that after all the calculations, the seconds value is an int and does not include partial second bits.	2018-02-28 14:27:33 -08:00
Dmitry Kuzmenko	4dfc44ac39	A basic fix for loading datetime objects with msgpack	2018-02-28 23:05:51 +03:00
Ronald van Zantvoort	61c5397805	Bugfix setting sysctl keys with '/' in it	2018-02-28 20:50:42 +01:00
Nicole Thomas	faa90cc6c2	Merge pull request #46213 from terminalmage/unicode-opts ... PY2: Remove conversion of values from config file to str types	2018-02-28 14:10:19 -05:00
rallytime	fde88d0dcd	Don't install msgpack 0.5.5 ... This version has known critical issues. See da902f9c1d (r27725642) for more information.	2018-02-28 12:21:32 -05:00
Erik Johnson	a7575aed67	Add unit test for config loading	2018-02-28 08:44:15 -06:00
Erik Johnson	0c89692708	Fix some config values loaded as str types on PY2 ... This covers a few config options which are populated from function calls that do not return unicode types.	2018-02-28 08:44:15 -06:00
Nicole Thomas	04c53f4cc4	Merge pull request #46217 from gtmanfred/2018.3.0rc1 ... fix ssh integration test with enable_ssh_minions	2018-02-28 09:32:21 -05:00
Erik Johnson	82a9169139	PY2: Remove conversion of values from config file to str types ... This removes a weird block that only affected string types loaded from a config file. We absolutely *do* want unicode types here, so we shouldn't be encoding them to str types. Also, this misguided code ignored strings in nested data structures, so it didn't even properly do what it was *trying* to do.	2018-02-27 23:41:19 -06:00