82350 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	d15f7ded82	Add integration test for 42116	2017-07-05 11:07:38 -05:00
Erik Johnson	c312e10cf9	Fix regression when CLI pillar override is used with salt-call	2017-07-05 11:03:27 -05:00
Nicole Thomas	9197055ea5	Merge pull request #42084 from terminalmage/assert-called-once ... Fix usage of assert_called_once in Python 3 < 3.6	2017-07-05 09:22:39 -06:00
Mike Place	965583fa55	Merge pull request #42097 from gtmanfred/timediff ... require large timediff for ipv6 warning	2017-07-03 20:02:23 -05:00
Mike Place	97c20c20cb	Import datetime	2017-07-03 16:37:31 -06:00
Mike Place	628e52d740	Merge pull request #42098 from twangboy/win_repo_docs ... Change repo_ng to repo-ng	2017-07-03 17:12:46 -05:00
Mike Place	41514b886e	Merge pull request #42096 from twangboy/win_use_default_configs ... Use default salt configs for Windows installs	2017-07-03 17:03:26 -05:00
Daniel Wallace	d5f91fe9b0	require large timediff for ipv6 warning	2017-07-03 14:24:36 -06:00
twangboy	5a5d70866a	Change repo_ng to repo-ng	2017-07-03 14:15:35 -06:00
twangboy	c1e899c0ca	Create Master installer if script is found	2017-07-03 13:54:27 -06:00
Mike Place	aef6963d07	Merge pull request #42089 from gtmanfred/spm ... pass cachedir from kwargs in cache	2017-07-03 14:41:48 -05:00
Mike Place	24a7d85b87	Merge pull request #42090 from twangboy/win_add_salt_bat ... Add missing batch file	2017-07-03 14:40:56 -05:00
twangboy	7da86b3540	Use default salt configs for Windows installs	2017-07-03 13:33:24 -06:00
twangboy	e4183a6d1c	Fix comments	2017-07-03 10:27:04 -06:00
twangboy	984b736e14	Add missing batch file	2017-07-03 10:24:10 -06:00
Daniel Wallace	1c495ced3c	pass cachedir from kwargs in cache	2017-07-03 09:55:19 -06:00
Erik Johnson	fdb8531724	Merge pull request #42071 from garethgreenaway/42070_state_runs_via_salt_ssh ... fix to ssh/wrapper/state.sls	2017-07-03 09:43:57 -05:00
Erik Johnson	d942752e95	Fix usage of assert_called_once in Python 3 < 3.6 ... This is a more complete fix which builds upon 41c65b0 and covers all refs to assert_called_once in the suite.	2017-07-03 09:30:12 -05:00
Gareth J. Greenaway	e9c8a4a225	When building up the remote file location nothing was being returned via _thin_dir so the remote path was starting with None. This change updates _thin_dir to return a value for format to use.	2017-07-01 17:44:16 -07:00
Mike Place	b95b165d0e	Merge pull request #42066 from terminalmage/thin-dir-py3 ... salt-ssh: get thin_dir from master_opts if not in opts	2017-06-30 20:32:22 -05:00
Erik Johnson	7e59d68910	salt-ssh: get thin_dir from master_opts if not in opts	2017-06-30 20:29:25 -05:00
Mike Place	9eb8ea5b33	Merge pull request #42025 from terminalmage/move-mkstemp ... Move salt.utils.files.mkstemp temporarily back to salt.utils	2017-06-30 20:14:29 -05:00
Erik Johnson	ed1e773dfc	Move salt.utils.files.mkstemp temporarily back to salt.utils ... Old code from earlier branches may cause problems when merging forward, this moves the function back to its old location and we will work on getting it permanently renamed in develop.	2017-06-30 18:24:50 -05:00
Mike Place	1bdb2f668b	Merge pull request #42061 from terminalmage/fix-loader-subdir ... LazyLoader: fix loading module from a subdir	2017-06-30 17:44:07 -05:00
Mike Place	5b2ae2dd04	Merge pull request #42062 from terminalmage/arch-grains-test ... Add debug logging for grains tests	2017-06-30 16:58:15 -05:00
Mike Place	ec378c73ff	Merge pull request #42020 from terminalmage/toctree-fix ... Add the new docker state modules to the toctree	2017-06-30 15:58:27 -05:00
Mike Place	9548588c79	Merge pull request #42050 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-06-30 15:58:01 -05:00
Mike Place	3ee31ea25e	Merge pull request #42057 from rallytime/ssh-unit-test ... Add mode back in for tmp file creation on Linux for ssh unit test	2017-06-30 15:54:23 -05:00
Erik Johnson	e454abc465	Use existing fpath_dirname variable ... This saves a call to os.path.dirname()	2017-06-30 15:44:19 -05:00
Erik Johnson	3071bb7a37	Add debug logging for grains tests ... The assert doesn't tell us anything about the grain that is failing. This adds some debug logging to make this easier to troubleshoot.	2017-06-30 15:39:48 -05:00
Erik Johnson	629d7eb31a	LazyLoader: fix loading module from a subdir ... PRs #41937 and #41963 changed the LazyLoader it so that newer Python releases (>=3.5) usee importlib instead of imp to load modules. However, when importlib is in use, and the module is being loaded from a __init__.py, the importlib.machinery.FileFinder instance is created with the path to the directory containing the __init__.py, which makes it impossible to find a match for the desired module. This commit passes the parent dir when instantiating the FileFinder so that it can properly locate the module.	2017-06-30 15:11:42 -05:00
rallytime	f0416acc37	Add mode back in for tmp file creation on Linux ... The mode arg was removed in PR #41966 to get this test to pass on Windows. However, this caused the same test to fail on Arch Linux when running Python 3. Let's keep the test the way it was for non-windows boxes, and only remove the mode for windows.	2017-06-30 12:06:54 -06:00
rallytime	c98470e557	Merge branch '2016.11' into '2017.7' ... No conflicts.	2017-06-30 10:00:10 -06:00
Nicole Thomas	0000f0f975	Merge pull request #42037 from rallytime/nitrogen-doc ... Replace some more "Nitrogen" references with 2017.7.0	2017-06-30 08:31:37 -06:00
Nicole Thomas	951ed4a9c9	Merge pull request #42032 from terminalmage/py3-tests ... Avoid race condition when iterating through processes	2017-06-30 08:29:54 -06:00
Mike Place	32b73efd2d	Merge pull request #42034 from rallytime/fix-41971 ... Add the 'provider' key to salt.cloud.CloudClient.create()	2017-06-30 09:01:19 -05:00
garethgreenaway	a0b537c8b6	Merge pull request #42026 from twangboy/win_unit_test_roots ... Fix `unit.fileserver.test_roots` for Windows	2017-06-29 17:53:16 -07:00
rallytime	8cd4f62e87	Replace some more "Nitrogen" references with 2017.7.0	2017-06-29 17:33:37 -06:00
Nicole Thomas	ca4e619edb	Merge pull request #42024 from leeclemens/doc/selinux ... doc: Specify versionadded for SELinux policy install/uninstall	2017-06-29 17:29:49 -06:00
Nicole Thomas	e3e576c636	Merge pull request #42009 from redmatter/fix-dockerng-network-ignores-test-2017.7 ... Fix dockerng.network_* ignoring of tests=True	2017-06-29 15:10:38 -06:00
Seth House	50856d0e28	Merge pull request #42030 from whiteinge/revert-py3-doc-chagnes-pt-2 ... Re-add msgpack to mocked imports	2017-06-29 14:47:59 -06:00
rallytime	3b87dbca12	Add the 'provider' key to salt.cloud.CloudClient.create() ... Much like how the 'profile' key exists in this function, the 'provider' key must also exist for other salt-cloud functions to work properly. Various salt-cloud functions rely on provider being available (as it is always available when using cloud profiles), and so it should be available when no profile is used as well. Also adjusted some rst syntax in the cloud config file as well as the documentation around the create() function. Passing in kwargs as the docs originally suggested does not work. Fixes #41971	2017-06-29 14:38:09 -06:00
rallytime	a77e1bd9dd	Add integration test for salt.cloud.CloudClient.create() function	2017-06-29 14:37:12 -06:00
Erik Johnson	d31939574b	Avoid race condition when iterating through processes ... If a process has already exited between when psutil.process_iter() was invoked, and when we invoke the cmdline() func, it will raise an exception. This commit catches this exception and skips these processes.	2017-06-29 15:08:17 -05:00
Seth House	18dfa9893c	Re-add msgpack to mocked imports	2017-06-29 13:49:45 -06:00
Mike Place	53031d2f55	Merge pull request #42028 from saltstack/revert-41961-py3_doc ... Revert "Allow docs to be built under Python 3"	2017-06-29 14:47:46 -05:00
Seth House	5592e6e5d4	Revert "Allow docs to be built under Python 3"	2017-06-29 13:32:09 -06:00
twangboy	cdb53c2657	Set file_roots for Windows Temp	2017-06-29 13:01:10 -06:00
Erik Johnson	fae46649e4	Merge pull request #42019 from gtmanfred/docker ... Revert docker documentation from pre nitrogen release that was merged forward.	2017-06-29 13:49:26 -05:00
Lee Clemens	b63a3c0fae	doc: Specify versionadded for SELinux policy install/uninstall	2017-06-29 14:36:25 -04:00