79371 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Pedro Algarvio	5de563bb77	Merge pull request #39806 from cachedout/thin_zip ... Support the creation of .zip thin file	2017-03-04 19:58:08 +00:00
Mike Place	3341e4e202	Merge pull request #39492 from whiteinge/full_return-arg ... Add full_return arg to LocalClient and RunnerClient	2017-03-04 09:14:17 -07:00
Mike Place	f223fa8906	Merge pull request #39794 from cachedout/clean_monitor_socket_shutdown ... Clean up errors which might be thrown when the monitor socket shuts down	2017-03-04 09:12:37 -07:00
Mike Place	c10abec6d3	Merge pull request #39797 from twangboy/win_fix_test_git ... Fix test_worktree_add_rm test for Windows	2017-03-04 09:12:12 -07:00
Mike Place	faffb834a6	Support the creation of .zip thin file	2017-03-04 09:10:07 -07:00
Mike Place	4002dc1947	Merge pull request #39819 from terminalmage/top-file-matching-docs ... Improve the Top File matching docs	2017-03-04 09:06:39 -07:00
Mike Place	c08aaeb7fd	Merge pull request #39820 from ni3mm4nd/beacons_topic_doc_typo ... Add missing apostrophe in Beacons topic documentation	2017-03-04 09:05:28 -07:00
Mike Place	bcc26d2721	Merge pull request #39821 from mitodl/develop ... Added fix for empty overrides value in apply config methods	2017-03-04 09:04:57 -07:00
Mike Place	cf483d5480	Merge pull request #39825 from terminalmage/fix-docker-timeout ... Fix regression in docker module when client is spawned	2017-03-04 09:02:48 -07:00
Mike Place	cbd2a4e3cc	Merge pull request #39826 from cachedout/yubikey_fix ... Add group func to yubikey auth	2017-03-04 09:02:13 -07:00
Mike Place	b912af6063	Merge pull request #39829 from moio/minionswarm-delay-starts ... minionswarm.py: add flag to delay starts	2017-03-04 09:01:28 -07:00
Silvio Moioli	573d6e9dfb	minionswarm.py: add flag to delay starts	2017-03-04 14:52:18 +01:00
Mike Place	6125eff02d	Add group func to yubikey auth ... Because we don't support groups with yubikeys (and can't, in fact) we need to dummy up this to always return false. This allows individual user auths to work, whereas they would fail prior to this change.	2017-03-03 16:46:24 -07:00
Erik Johnson	830c4b8914	Fix regression in docker module when client is spawned ... PR #39597 broke this module by introducing an UnboundLocalError. This fixes that error.	2017-03-03 16:19:08 -06:00
Pedro Algarvio	69f1c0fc64	Merge pull request #39822 from s0undt3ch/features/py3 ... A tiny bit more of py3	2017-03-03 22:12:11 +00:00
Pedro Algarvio	44ba96613b	This needs to be done as a PyLint plugin not as this kind of test. ... It's the only way we can check all code paths of the __virtual__ function. Regarding the 3rd-party modules gating, we also need to create a pylint plugin which known what are the hard deps of Salt and will complain on all other 3rd-party imports.	2017-03-03 20:35:17 +00:00
Pedro Algarvio	f4732d5433	Lint fixes	2017-03-03 19:28:45 +00:00
Pedro Algarvio	adacf4cc28	Don't expect any ordering from sets!!!!!	2017-03-03 18:31:11 +00:00
twangboy	2a6e61a42e	Add encode for Py3 compatability	2017-03-03 10:53:12 -07:00
Pedro Algarvio	08eba84cfb	Upgrade the six library ... 1.10.0 ------ - Issue benjaminp/six#122: Improve the performance of `six.int2byte` on Python 3. - Pull request benjaminp/six#55 and issue benjaminp/six#99: Don't add the `winreg` module to `six.moves` on non-Windows platforms. - Pull request benjaminp/six#60 and issue benjaminp/six#108: Add `six.moves.getcwd` and `six.moves.getcwdu`. - Pull request benjaminp/six#64: Add `create_unbound_method` to create unbound methods.	2017-03-03 17:42:36 +00:00
Tobias Macey	4b61671460	Added fix for empty overrides value in apply config methods ... In `apply_minion_config` and `apply_master_config` there is a call to `overrides.get` while the `overrides` value still has the potential of being `None`. Updated the call to be `(overrides or {}).get` to prevent unwarranted exceptions.	2017-03-03 12:33:41 -05:00
twangboy	54891a57b1	Fix type in second worktree_path	2017-03-03 10:24:28 -07:00
Seth House	2633f70c3a	Add dummy kwarg to WheelClient().cmd_sync() to match mixin ... At some point these two kwargs should be wired up to match RunnerClient.	2017-03-03 10:13:59 -07:00
Jan Kadlec	804b12048c	Add missing apostrophe	2017-03-03 17:58:53 +01:00
Erik Johnson	7178e77eee	Improve the Top File matching docs ... In 2014.7.0, default matcher in the top file was changed to the compound matcher, but the docs still suggest that it is the glob matcher. This commit updates the docs to explicitly mention that the compound matcher is now the default, and adds a table describing all of the available matchers that can be set in the top file.	2017-03-03 10:40:22 -06:00
Mike Place	be48790927	Merge pull request #39415 from bbinet/gen_thin-absonly ... Restore support to generate thin tarballs with local packages	2017-03-03 09:18:44 -07:00
Mike Place	d8396e444e	Merge pull request #39494 from mchugh19/conn_updates ... Allow states to declare _connection_ keys as documented	2017-03-03 09:07:06 -07:00
Mike Place	f575ef459f	Merge pull request #39624 from drawsmcgraw/39622 ... Address issue 39622	2017-03-03 08:59:03 -07:00
Mike Place	17986d0977	Merge pull request #39790 from gtmanfred/develop ... add get_or_set_hash to sdb	2017-03-03 08:23:26 -07:00
Mike Place	58477d0fb8	Merge pull request #39809 from kadefor/patch-1 ... Fix salt-ssh cp.get_url wapper bug	2017-03-03 08:22:29 -07:00
Mike Place	7460e460e1	Merge pull request #39808 from carlpett/vault-lowercase-policies ... Vault: Always lowercase policies	2017-03-03 08:21:59 -07:00
Pedro Algarvio	f5de085ac4	Add test case which will catch SOME problems with __virtual__ calls. ... And also 3rd-party import errors.	2017-03-03 15:19:34 +00:00
Pedro Algarvio	5f388e7ea2	Minor fixes	2017-03-03 15:19:24 +00:00
Pedro Algarvio	43dcc01275	Separate the error	2017-03-03 15:18:42 +00:00
Mike Place	4cdec67f27	Merge pull request #39815 from guettli/patch-2 ... Changed "Template is an empty file" to debug.	2017-03-03 08:18:33 -07:00
Pedro Algarvio	d3bfaac650	Gate 3rd party import	2017-03-03 15:18:15 +00:00
Mike Place	0a6f3688a6	Merge pull request #39810 from marnovdm/feature-fix-interafce-typo ... Minor typo fix	2017-03-03 08:17:50 -07:00
Pedro Algarvio	e180f1e913	Normalize the mode	2017-03-03 15:15:13 +00:00
Pedro Algarvio	b07633e326	Merge pull request #39816 from s0undt3ch/develop ... Minor fixes to running tests	2017-03-03 15:14:48 +00:00
Pedro Algarvio	3b0b60dd9f	Error out when the path passed is not valid tests module	2017-03-03 12:41:27 +00:00
Pedro Algarvio	c687b6112a	Account for test module names prefixed with tests.	2017-03-03 12:41:27 +00:00
Thomas Güttler	0021b65ec2	Changed "Template is an empty file" to debug.	2017-03-03 13:20:13 +01:00
Marno van der Molen	04f097b59c	Minor typo fix	2017-03-03 09:59:50 +01:00
Calle Pettersson	c745415b8b	Vault: Always lowercase policies	2017-03-03 09:05:27 +01:00
Kade	e556be369a	Fix salt-ssh cp.get_url wapper bug ... In fileclient.get_url function, the 2nd arg is "dest", not "saltenv".	2017-03-03 15:58:53 +08:00
Mike Place	251c85bd81	Merge pull request #39803 from bodhi-space/infra4579 ... INFRA-4579 - small fixes for boto3_elasticache state module	2017-03-02 22:29:58 -07:00
Mike Place	9ce11794b7	Merge pull request #39800 from twangboy/win_fix_test_useradd ... Fix test_add_user_to_group for Windows	2017-03-02 22:26:35 -07:00
Mike Place	d0440e2a2a	Merge pull request #39799 from Ch3LL/fix_salt_key_msg ... Fix deleteed message when key is deleted	2017-03-02 22:17:40 -07:00
Mike Place	02f00a9c41	Merge pull request #39795 from twangboy/fix_whitelist ... Fix incorrect test name	2017-03-02 22:16:37 -07:00
Pedro Algarvio	ac998c3398	Merge pull request #39801 from s0undt3ch/develop ... Stop returning `None`	2017-03-03 01:03:05 +00:00