90699 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Nicole Thomas	32a0561ca8	Merge pull request #46223 from rallytime/bp-46221 ... Back-port #46221 to 2018.3.0rc1	2018-02-27 17:15:13 -05:00
Erik Johnson	13abc175e1	Fix hanging tests in integration suite ... A recent change to nginx appears to be causing this test to fail to cache the test file in the temp nginx instance we've spun up. This causes the return of cp.cache_file to be False, which in and of itself should be enough to fail the test. But since we're not asserting on the cp.cache_file results, flow proceeds to the next block of code, in which we open the "file" that we cached. Some genius thought it would be a swell idea to make io.open() successfully open a filehandle when the path passed to it is a boolean False. When you try to read from this filehandle, an AMAZING thing happens... It just blocks. Forever. I know, right? Pure genius. This commit adds an assert so that the test fails gracefully and doesn't try to read from a bogus filehandle that SHOULDN'T EVEN EXIST.	2018-02-27 14:58:36 -05:00
Daniel Wallace	0d340757ad	fix ssh integration test with enable_ssh_minions ... Fix for MacOS	2018-02-27 10:34:54 -07:00
Nicole Thomas	2f12375397	Merge pull request #46211 from s0undt3ch/2018.3.0rc1 ... Fix docstring	2018-02-27 11:49:23 -05:00
Nicole Thomas	6731dfcc5a	Merge pull request #46209 from terminalmage/issue46205 ... Fix references to renamed attributes from salt.utils.gitfs	2018-02-27 09:41:19 -05:00
Pedro Algarvio	6c8c772864	Fix docstring	2018-02-27 14:13:31 +00:00
Erik Johnson	ee06749d7a	Fix references to renamed attributes from salt.utils.gitfs ... This change should have been part of a0f7eec7, but these refs were overlooked.	2018-02-26 22:14:17 -06:00
Nicole Thomas	feedfaf41a	Merge pull request #46190 from s0undt3ch/2018.3.0rc1 ... Minor fixes to the scheduler	2018-02-26 16:30:01 -05:00
Nicole Thomas	0a7e347489	Merge pull request #46193 from isbm/isbm-py3-ssdp-bytes ... Bugfix: SSDP crash on Python3 environment (bytes vs unicode)	2018-02-26 13:54:02 -05:00
Gareth J. Greenaway	399cf8d74b	Update schedule.py ... Need to specify the timedelta as seconds.	2018-02-26 10:42:09 -08:00
Bo Maryniuk	f00cf88c7b	Fix unit test for socket data	2018-02-26 15:04:49 +01:00
Bo Maryniuk	cf96edbb3c	Fix socket datagram information on Python3	2018-02-26 15:04:37 +01:00
Pedro Algarvio	b27bbc258c	once might already be a datetime object	2018-02-26 14:02:38 +00:00
Pedro Algarvio	88c0420fc2	Expicit run date might already be datetime objects	2018-02-26 14:01:07 +00:00
Pedro Algarvio	bf671d7e8e	_run_explicit is always instantiated as a list.	2018-02-26 13:59:47 +00:00
Pedro Algarvio	72e1a0bbca	skip_explicit objects might already be datetime objects	2018-02-26 13:46:22 +00:00
Pedro Algarvio	74d9cfeeb5	Remove unuseful code, _skip_explicit was instantiated as a list.	2018-02-26 13:43:53 +00:00
Pedro Algarvio	75f87dcedc	Define loop_interval only once. ... Covert to a timedelta object only if not a timedelta object already.	2018-02-26 13:05:57 +00:00
Pedro Algarvio	d0b3dad5ba	Don't try to parse a datetime object	2018-02-26 13:02:02 +00:00
Nicole Thomas	b527a6cec7	Merge pull request #46165 from rallytime/man-pages-rc1 ... Add man pages for oxygen release	2018-02-24 06:56:06 -05:00
Nicole Thomas	0537e83c4c	Merge pull request #46173 from gtmanfred/mac_autologin ... fix unicode for mac autologin test	2018-02-24 06:18:00 -05:00
Daniel Wallace	667b5b9f0c	fix unicode for mac autologin test	2018-02-23 17:00:56 -07:00
rallytime	a731047e59	Add man pages for oxygen release	2018-02-23 12:15:13 -05:00
Nicole Thomas	e6374bf68d	Merge pull request #46149 from rallytime/bp-46145 ... Back-port #46145 to oxygen.rc1	2018-02-22 16:57:51 -05:00
Nicole Thomas	8cd5d44390	Merge pull request #46147 from dincamihai/oxygen.rc1-salt-ssh-fix ... Fix salt-ssh state.apply "'NoneType' object has no attribute 'count'" and unicode issue	2018-02-22 16:49:57 -05:00
rallytime	29468f3dce	Lint fixes	2018-02-22 14:18:28 -05:00
Erik Johnson	22b68ac3da	pillarenv argument should default to None and not the value from opts	2018-02-22 11:20:55 -05:00
Erik Johnson	8d24b20ab3	Better solution for fixing the opts munging in pillar.show_pillar runner ... The pillarenv argument to the `Pillar` class is only used as an override of what is in the opts. Therefore, it should default to None unless passed in the kwargs. This also removes the need for a deepcopy of the opts, since we're no longer making changes to the opts before passing them to the `Pillar` constructor.	2018-02-22 10:51:54 -05:00
Erik Johnson	2b887dd77d	Update tests to reflect changes to the SaltCacheLoader	2018-02-22 10:51:36 -05:00
Erik Johnson	6a8b1ac33a	Document behavior when orchestration runnner invoked with non-orch states ... This also replaces some += usage with list.extend for a modest performance/memory improvement.	2018-02-22 10:49:39 -05:00
Erik Johnson	a8cded1c83	Instantiate the SaltCacheLoader's fileclient in the __init__ ... This fixes an edge case when orchestration attempts to compile pillar data before making any other fileclient requests.	2018-02-22 10:47:15 -05:00
Erik Johnson	d2e26c38ca	salt.runners.pillar.show_pillar: don't modify master opts ... This keeps us from modifying the master opts when compiling pillar data in this runner.	2018-02-22 10:47:15 -05:00
Erik Johnson	7c2cb27108	Properly detect use of the state.orch alias and add orch jid to kwargs ... Before, only when `salt-run state.orchestrate` was used would we add the orch jid to the kwargs.	2018-02-22 10:46:46 -05:00
Mihai Dinca	5af8c5c745	Fix salt-ssh state.apply "'NoneType' object has no attribute 'count'" ... and unicode issue Co-authored-by: Jochen Breuer <jbreuer@suse.de>	2018-02-22 16:29:21 +01:00
Nicole Thomas	6b5b56d302	Merge pull request #46146 from terminalmage/update-version-2018.3.0 ... Update refrences to Oxygen codename to 2018.3.0	2018-02-22 09:26:01 -05:00
Nicole Thomas	391f45b5cd	Merge pull request #46005 from gtmanfred/ssh ... pass opts to SSHClient for enable_ssh_minions	2018-02-22 09:10:44 -05:00