84794 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	e2140d9a84	Mock the ssh.key_is_encrypted utils func	2018-02-15 14:37:50 -06: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
Erik Johnson	f2b69f703d	git.latest: Fix regression with identity file usage ... Unit test included	2018-02-15 09:35:10 -06:00
Nicole Thomas	6d534c6e7e	Merge pull request #46009 from Ch3LL/rn_7.4 ... Add 2017.7.4 Release Notes with PRs	2018-02-13 11:40:29 -05:00
Ch3LL	ac0baf4b34	Add 2017.7.4 Release Notes with PRs	2018-02-13 11:31:20 -05:00
Nicole Thomas	ca76a0b328	Merge pull request #45981 from gtmanfred/2017.7.3 ... use local config for vault when masterless	2018-02-13 10:22:00 -05:00
Daniel Wallace	0d448457dc	apparently local is not set by default	2018-02-12 12:53:59 -07:00
Daniel Wallace	2a92f4bc16	use local config for vault when masterless	2018-02-12 09:16:38 -07:00
Nicole Thomas	6530649dbc	Merge pull request #45953 from rallytime/bp-45928-2017.7.3 ... Back-port #45928 to 2017.7.3	2018-02-09 17:29:09 -05:00
Gareth J. Greenaway	85363189d1	Fixing vault when used with pillar over salt-ssh	2018-02-09 11:46:21 -05:00
Nicole Thomas	fb378cebb0	Merge pull request #45934 from rallytime/bp-45902 ... Back-port #45902 to 2017.7.3	2018-02-09 11:31:07 -05:00
Nicole Thomas	0d74151c71	Merge pull request #45935 from rallytime/bp-45742 ... Back-port #45742 to 2017.7.3	2018-02-09 09:02:25 -05:00
Marc Vieira-Cardinal (VA2MVC)	6a0b5f7af3	Removed the chained copy	2018-02-08 16:36:20 -05:00
Marc Vieira-Cardinal (VA2MVC)	ad1150fad4	list.copy() is not compatible with python 2.7 ... I doubt that a .copy() is required there since list() would already create one but since the previous committer added it I am improving by replacing the .copy() with a [:] which makes a copy in python 2.7 and 3+	2018-02-08 16:36:19 -05:00
Erik Johnson	bb83e8b345	Add regression test for issue 45893	2018-02-08 16:31:23 -05:00
Erik Johnson	cdda66d759	Remove duplicated section in docstring and fix example	2018-02-08 16:31:23 -05:00
Erik Johnson	4b6351cda6	Check the effective saltenv for cached archive ... This fixes a regression caused by using a saltenv other than `base`.	2018-02-08 16:31:23 -05:00
Nicole Thomas	1439da8d76	Merge pull request #45755 from terminalmage/issue45743 ... salt.crypt: Ensure message is encoded before signing	2018-01-29 14:04:49 -05:00
Erik Johnson	8af1251c59	salt.crypt: Ensure message is encoded before signing	2018-01-29 10:53:37 -06:00
Nicole Thomas	fe194d755f	Merge pull request #45700 from Ch3LL/7.3_rn ... Add PRs to 2017.7.3 Release Notes	2018-01-25 15:56:44 -05:00
Ch3LL	84c8216901	Add PRs to 2017.7.3 Release Notes	2018-01-25 15:51:34 -05:00
Nicole Thomas	ce41f6a6ee	Merge pull request #45681 from damon-atkins/2017.7.3_win_release_notes ... 2017.7.3 Release notes for Windows	2018-01-25 10:13:17 -05:00
Nicole Thomas	2f303439b7	Merge pull request #45672 from rallytime/bp-45667 ... Back-port #45667 to 2017.7.3	2018-01-25 09:04:53 -05:00
Damon Atkins	1d21f86228	Update 2017.7.3.rst	2018-01-25 19:37:32 +11:00
Daniel Wallace	74bbaeb7ce	we should default to upgrading when refreshing on archlinux ... Archlinux does not do resolution for soname bumps, so if one set of packages is updated, but something depended on a dependency package's soname, and it is bumped, the other package will break. When refreshing the package database, there should always be a -Su, run to upgrade all other packages on the system. But still allow sysupgrade to be set to false to override this behavior. http://gist.io/5660494 make review changes	2018-01-24 17:19:44 -05:00
Nicole Thomas	23ff1264e0	Merge pull request #45669 from rallytime/man-pages-2017.7.3 ... Update man pages for 2017.7.3 release	2018-01-24 16:04:59 -05:00
rallytime	d31b41adeb	Update man pages for 2017.7.3 release	2018-01-24 13:46:43 -05:00
Nicole Thomas	9a17405ba6	Merge pull request #45666 from terminalmage/salt-jenkins-793 ... Fix failing pkg integration tests for releases with no '.'	2018-01-24 12:19:09 -05:00
Erik Johnson	4a6ab729dd	Fix failing pkg integration tests for releases with no '.' ... Fedora releases are integers, and Arch's osrelease is simply `rolling`, so https://github.com/saltstack/salt/pull/45636 caused these tests to regress. This fixes them by moving the osrelease check until after the MacOS check. It also fixes the windows check, which would _always_ evaluate to `True` since it was not calling the function. Therefore, the `if` would just be a simple boolean which would resolve to `True` since it was just checking a function reference.	2018-01-24 10:13:22 -06:00
Erik Johnson	0717f7a578	Merge pull request #45664 from rallytime/bp-45452 ... Back-port #45452 to 2017.7.3	2018-01-24 09:33:12 -06:00
Alejandro del Castillo	369720677b	opkg.py: make owner function return value, instead of iterator ... Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>	2018-01-24 10:21:00 -05:00
Nicole Thomas	7934372b7b	Merge pull request #45649 from rallytime/bp-45634 ... Back-port #45634 to 2017.7.3	2018-01-24 09:59:42 -05:00
Nicole Thomas	770f0c4664	Merge pull request #45654 from twangboy/win_fix_shell_info_2017.7.3 ... Merge forward #45638	2018-01-24 09:59:13 -05:00
Erik Johnson	6fc293da46	Merge pull request #45653 from rallytime/bp-45611 ... Back-port #45611 to 2017.7.3	2018-01-23 23:20:11 -06:00
twangboy	5bb01aeb8c	Merge forward #45638	2018-01-23 16:01:35 -07:00
Erik Johnson	0a6b06d8ea	Fix unnecessary/incorrect usage of six.binary_type	2018-01-23 17:54:27 -05:00
Nicole Thomas	0a07e0d259	Merge pull request #45642 from rallytime/bp-45636 ... Back-port #45636 to 2017.7.3	2018-01-23 17:00:29 -05:00
Nicole Thomas	f37a5b6d8d	Merge pull request #45645 from rallytime/bp-45606 ... Back-port #45606 to 2017.7.3	2018-01-23 16:54:45 -05:00
Ch3LL	1c78fc23ea	Add different service name for Mac 10.13 test	2018-01-23 16:53:06 -05:00
Nicole Thomas	e659793c09	Merge pull request #45641 from rallytime/bp-45508 ... Back-port #45508 to 2017.7.3	2018-01-23 16:18:38 -05:00
Erik Johnson	d52d96f30a	Fix bug affecting salt-ssh when root_dir differs from the default ... H/T https://github.com/saltstack/salt/issues/44957#issuecomment-356122811	2018-01-23 15:04:50 -05:00
Frode Gundersen	e6917a291e	fix test_archive test for mac on 2017.7 branch	2018-01-23 14:35:32 -05:00
Ch3LL	df0ad54c9a	remove unnecessary variable for test	2018-01-23 11:47:32 -05:00
Ch3LL	acb14fd43d	fix pylint	2018-01-23 11:42:49 -05:00
Ch3LL	a9b12cd1ea	Fix mac service and pkg tests for 10.13	2018-01-23 11:39:06 -05:00
Nicole Thomas	ced3269ae8	Merge pull request #45604 from rallytime/bp-45582 ... Back-port #45582 to 2017.7.3	2018-01-22 11:54:14 -05:00
rallytime	bc8a450cc7	Remove state.py utils file from thin list ... It doesn't exist in 2017.7	2018-01-22 08:53:25 -05:00
Erik Johnson	629e6c9674	Further fixes to for salt-ssh test under heavy load ... This makes some further tweaks to make the test more stable under heavy load. Firstly, the background job sleeps longer, and secondly, we make up to 3 attempts run state.running instead of just the one, in case our first attempt was too early. It also uses threading to make the job sleep, since the method of adding a & to the command seemed to be producing intermittent failures with returning clean JSON.	2018-01-22 07:33:42 -05:00