91057 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	25deebf7a6	Merge branch '2017.7.3' into '2017.7' ... Conflicts: - salt/modules/git.py	2018-02-22 10:22:22 -05:00
Erik Johnson	2a185855ea	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 09:19:41 -06:00
Nicole Thomas	0398ce0482	Merge pull request #46135 from rallytime/bp-46088 ... Back-port #46088 to 2017.7	2018-02-22 10:11:13 -05:00
Mihai Dinca	99079fc442	Remove obsolete unicode handling in pkg.info_installed	2018-02-22 15:30:24 +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
Nicole Thomas	d78d213ac0	Merge pull request #46143 from garethgreenaway/fixing_failing_scheduler_tests ... [oxygen.rc1] fix failing schedule tests	2018-02-22 09:10:11 -05:00
Erik Johnson	e2c4702e0c	Update tests to reflect changes to the SaltCacheLoader	2018-02-21 23:20:02 -06:00
Erik Johnson	c77341b544	Rename release notes file to 2018.3.0.rst, add 2018.3.* to release tree	2018-02-21 21:56:54 -06:00
Erik Johnson	1668a489c4	Update refrences to Oxygen codename to 2018.3.0	2018-02-21 21:47:41 -06:00
Erik Johnson	f9301fcc34	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-21 20:36:30 -06:00
Erik Johnson	9644579cd0	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-21 20:36:30 -06:00
Erik Johnson	f9a6c86e21	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-21 20:36:29 -06:00
Erik Johnson	e0940a9fc4	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-21 20:36:29 -06:00
Nicole Thomas	2934d55c0b	Merge pull request #46141 from rallytime/bp-46123 ... Back-port #46123 to oxygen.rc1	2018-02-21 17:28:53 -05:00
Nicole Thomas	102958335d	Merge pull request #46140 from rallytime/bp-45911 ... Back-port #45911 to oxygen.rc1	2018-02-21 17:28:18 -05:00
Gareth J. Greenaway	0d4647c2dd	Removing unnecessary log.	2018-02-21 13:14:05 -08:00
Gareth J. Greenaway	2df1866cc1	Adding a internal reset function to scheduler. Calling reset between schedule tests to ensure schedule is empty and it is using defaults.	2018-02-21 13:00:19 -08:00
Nicole Thomas	1fcbbd1e02	Merge pull request #46136 from rallytime/bp-46115 ... Back-port #46115 to 2017.7	2018-02-21 14:17:22 -05:00
Daniel Wallace	713374b7ab	If no pubkey is passed in openmode fail ... If the pub entry in the load is empty, we should fail authentication in open mode. This is usually caught elsewhere for the other modes, because we would just write it to a file, but in this case, we only write it to a file if it actually exists, and if it is different from disk_key, so we would catch all other options when trying to load the public key. Fixes #46085	2018-02-21 14:09:17 -05:00
twangboy	3f4c340e3c	Update log statement	2018-02-21 14:04:49 -05:00
twangboy	7cd81a5cb5	Change the Invalid Data Message	2018-02-21 14:04:49 -05:00
twangboy	86c075e6e9	Convert reg values to unicode for debug	2018-02-21 14:04:48 -05:00
Nicole Thomas	11e5e8eb86	Merge pull request #45911 from twangboy/win_fix_lgpo_unicode ... LGPO Module: Convert reg values to unicode for debug	2018-02-21 14:02:16 -05:00
Nicole Thomas	524a6a72a0	Merge pull request #46123 from gtmanfred/2017.7 ... If no pubkey is passed in openmode fail	2018-02-21 14:01:46 -05:00
twangboy	bcde5cc625	Update log statement	2018-02-21 09:47:54 -07:00
twangboy	e9fa53d3b7	Change the Invalid Data Message	2018-02-21 09:47:53 -07:00
twangboy	c818d4b791	Convert reg values to unicode for debug	2018-02-21 09:47:52 -07:00
Daniel Wallace	53d969a152	mark orch test as flaky	2018-02-21 09:41:57 -07:00
Nicole Thomas	e48fa58012	Merge pull request #46131 from vutny/doc-formula-formatting ... [DOC] Fix code-blocks for reStructuredText	2018-02-21 10:47:05 -05:00
Daniel Wallace	8d36730ef7	If no pubkey is passed in openmode fail ... If the pub entry in the load is empty, we should fail authentication in open mode. This is usually caught elsewhere for the other modes, because we would just write it to a file, but in this case, we only write it to a file if it actually exists, and if it is different from disk_key, so we would catch all other options when trying to load the public key. Fixes #46085	2018-02-21 08:38:30 -07:00
Volodymyr Samodid	0a481d707f	update digitalocean salt-cloud driver ... fix #45837	2018-02-21 10:33:29 -05:00
Damon Atkins	99e7f6a7d3	update ec2 pillar arguments with better names	2018-02-22 02:25:36 +11:00
zr	57a60f62a3	fix kernel subpackages install bug	2018-02-21 10:25:12 -05:00
Nicole Thomas	6cea44ee95	Merge pull request #46118 from rallytime/bp-44603 ... Back-port #44603 to 2017.7	2018-02-21 10:21:41 -05:00
Nicole Thomas	a79d4f12a7	Merge pull request #46119 from rallytime/bp-46094 ... Back-port #46094 to oxygen.rc1	2018-02-21 10:18:58 -05:00
Nicole Thomas	1f31031adc	Merge pull request #46116 from rallytime/utils-paths ... Update stringutils path in reg state to use new location	2018-02-21 10:05:43 -05:00
Nicole Thomas	0e63decaac	Merge pull request #46117 from Ch3LL/mac_ssh_schema ... Add stringutils.to_str in test_roster_config_validate test	2018-02-21 09:57:44 -05:00
Nicole Thomas	a50bb41849	Merge pull request #46110 from isbm/isbm-iscsii-master-nonroot ... IQN check for iSCSII crash on non-root Master	2018-02-21 09:56:53 -05:00
Nicole Thomas	178eaab503	Merge pull request #46105 from DSRCorporation/bugs/M2Crypto_py3_unicode_fix ... M2Crypto Py3 unicode fix	2018-02-21 09:30:33 -05:00
Denys Havrysh	d8fb051e44	[DOC] Fix code-blocks for reStructuredText	2018-02-21 15:37:57 +02:00
Bo Maryniuk	1b75f98a91	Catch proper exception type	2018-02-21 13:11:44 +01:00
rallytime	0ed338e643	Update release versions for the 2017.7 branch	2018-02-21 06:37:22 -05:00
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
Bo Maryniuk	5149cdbbd9	Fix unit test for py3	2018-02-21 10:53:20 +01:00
Daniel Wallace	9ce14b2a12	pass opts to SSHClient for enable_ssh_minions ... Also, use ckminions to get the minions from the roster, instead of doing it in publish.	2018-02-20 16:06:00 -07: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
Nicole Thomas	772636f67a	Merge pull request #46084 from garethgreenaway/oxygen_swap_to_datetime_objects ... [oxygen] swap scheduler to use datetime objects	2018-02-20 17:51:26 -05:00
Nicole Thomas	8f245ea62e	Merge pull request #46069 from rallytime/bp-46036 ... Back-port #46036 to oxygen.rc1	2018-02-20 17:50:17 -05:00