91676 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Super-User	7b32faa0ce	Phase 0 - salt.utils.zfs tests	2018-02-24 13:37:42 +01:00
mephi42	46996178e2	Allow configuring HTTP connect timeout	2018-02-24 13:21:26 +01: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
rallytime	69ac94baca	Update utils paths	2018-02-24 06:55:09 -05:00
rallytime	cffbf52c10	Lint fix: remove extra line	2018-02-24 06:51:25 -05:00
Ronald van Zantvoort	0bef7c316a	better defaults for docker.prune	2018-02-24 12:22:25 +01: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
Ronald van Zantvoort	736aa225be	Add docker.prune - pruning for Docker subsystems	2018-02-24 12:17:18 +01:00
Daniel Wallace	667b5b9f0c	fix unicode for mac autologin test	2018-02-23 17:00:56 -07:00
Ronald van Zantvoort	beabf4f06b	cmdmod: reimplementation of #45932 for Oxygen	2018-02-23 22:19:15 +01:00
Nicole Thomas	8aaac011b4	Merge pull request #45905 from jasperla/pf ... add execution module for OpenBSD Packet Filter	2018-02-23 14:28:17 -05:00
Nicole Thomas	90353c90f8	Merge pull request #45820 from iustinam/reusetok ... Make vault session token reusable	2018-02-23 14:26:29 -05:00
Nicole Thomas	606d70c521	Merge pull request #45945 from xyoun/develop ... pip.list_all_versions now can read index_url	2018-02-23 14:23:48 -05:00
Nicole Thomas	ebd3b0d88c	Merge pull request #46003 from rrzaripov/update_win_network_ip_addrs ... Updating functions win_network.ip_addrs	2018-02-23 14:22:54 -05:00
Nicole Thomas	705caa8cca	Merge pull request #46148 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.3 to 2017.7	2018-02-23 14:21:38 -05:00
Nicole Thomas	803138f5e5	Merge pull request #46130 from areaxx/develop ... [#46028] strictly separate extension with and without classifier	2018-02-23 14:11:31 -05:00
Nicole Thomas	05b771bfd7	Merge pull request #46160 from rallytime/flaky-tests ... Mark 2 tests as flaky	2018-02-23 14:10:05 -05:00
Gareth J. Greenaway	36facd3f18	Merge pull request #46169 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-02-23 11:09:32 -08:00
rallytime	b97eafc85e	Reduce the number of days an issue is stale by 10	2018-02-23 14:06:25 -05:00
Daniel Wallace	ac99bd26db	driver and provider should be specified ... This is not needed in Oxygen	2018-02-23 11:55:43 -07:00
rallytime	a731047e59	Add man pages for oxygen release	2018-02-23 12:15:13 -05:00
Gareth J. Greenaway	8faf87a6d3	Adding a timezone to grains locale_info	2018-02-23 08:54:50 -08:00
rallytime	79bed6cff1	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/cmdmod.py - salt/modules/reg.py - salt/modules/win_lgpo.py - salt/modules/win_path.py - salt/modules/win_pkg.py - salt/pillar/file_tree.py - salt/states/boto3_route53.py - salt/states/reg.py - salt/utils/win_functions.py - tests/unit/modules/test_kubernetes.py - tests/unit/modules/test_win_path.py	2018-02-23 09:50:19 -05:00
rallytime	49e49ae51b	Mark 2 tests as flaky ... - integration.spm.test_man_spm.SPMManTest.test_man_spm - integration.ssh.test_state.SSHStateTest.test_state_running	2018-02-23 09:34:14 -05:00
Nicole Thomas	10a47dcbc4	Merge pull request #46137 from damon-atkins/2017.7_fix_ec2_pillar2 ... [2017.7] update ec2 pillar arguments with better names	2018-02-23 08:32:04 -05:00
Nicole Thomas	d74cb14557	Merge pull request #46145 from terminalmage/issue46004 ... 3 small fixes for runners/orchestration	2018-02-22 17:11:10 -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
Jasper Lievisse Adriaanse	a973b70d64	add execution module for OpenBSD Packet Filter	2018-02-22 21:08:35 +01:00
Nicole Thomas	9b2bc1982c	Merge pull request #46006 from dincamihai/oxygen.rc1 ... Remove obsolete unicode handling in pkg.info_installed	2018-02-22 14:22:35 -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	467ff841cd	pillarenv argument should default to None and not the value from opts	2018-02-22 10:01:40 -06: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
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