83308 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	9d8486a894	Add test for custom YAML loader with unicode literal strings	2017-08-15 11:06:20 -05:00
Ch3LL	dcd92042e3	remove extra doc	2017-08-15 12:05:54 -04:00
Erik Johnson	a0118bcece	Remove bytestrings and use textwrap.dedent for readability ... PyYAML works with and without bytestrings on PY3, and Python 3 can read all of the test data as regular strings, so bytestrings are unnecessary here. This also adds use of textwrap.dedent to make the YAML easier to read, so it can be indented away from the far left side of the line.	2017-08-15 11:05:48 -05:00
Ch3LL	693a504ef0	update release notes with cve number	2017-08-15 11:57:33 -04:00
Daniel Wallace	bd63074e7a	create new ip address before checking list of allocated ips ... This will help prevent a race condition of all cloud servers being built in parallel trying to build with the same floating ip address.	2017-08-15 09:19:05 -06:00
Nicole Thomas	c1c8cb9bfa	Merge pull request #42868 from carsonoid/redisjobcachefix ... Stub out required functions in redis_cache	2017-08-15 10:33:54 -04:00
Mike Place	e192d6e0af	Merge pull request #42810 from amendlik/win-snmp-community ... Ignore error values when listing Windows SNMP community strings	2017-08-14 21:55:15 -06:00
Mike Place	a1817f1de3	Merge pull request #42920 from cachedout/pid_race ... pid_race	2017-08-14 21:49:09 -06:00
Mike Place	11a33fe692	Merge pull request #42925 from terminalmage/f26-debug-logging ... Add debug logging to troubleshoot test failures	2017-08-14 21:47:50 -06:00
Gareth J. Greenaway	5ac41f496d	When running osquery commands through cmd.run we should pass python_shell=True to ensure everything is formatted right. #42873	2017-08-14 20:47:43 -07:00
Erik Johnson	8165f46165	Add debug logging to troubleshoot test failures ... This adds logging to troubleshoot https://github.com/saltstack/salt-jenkins/issues/477	2017-08-14 16:28:09 -05:00
Nicole Thomas	c0ff69f88c	Merge pull request #42836 from lyft/backport-utils.versions-to-2016.11 ... Backport salt.utils.versions from develop to 2016.11	2017-08-14 16:56:54 -04:00
Nicole Thomas	a537197030	Merge pull request #42913 from twangboy/win_change_timeout ... Change service shutdown timeouts for salt-minion service (Windows)	2017-08-14 16:55:24 -04:00
Mike Place	ca0555f616	Merge pull request #42800 from skizunov/develop6 ... Fix exception when master_type=disable	2017-08-14 13:53:37 -07:00
Nicole Thomas	3af264b664	Merge pull request #42679 from cloudflare/napalm-multiprocessing ... Add multiprocessing option for NAPALM proxy	2017-08-14 16:45:05 -04:00
Nicole Thomas	64a79dd5ac	Merge pull request #42919 from rallytime/bp-42871 ... Back-port #42871 to 2016.11	2017-08-14 16:43:59 -04:00
Nicole Thomas	bea8ec1098	Merge pull request #42918 from rallytime/bp-42848 ... Back-port #42848 to 2016.11	2017-08-14 16:43:42 -04:00
Nicole Thomas	4fcdab3ae9	Merge pull request #42657 from nhavens/2017.7 ... back-port #42612 to 2017.7	2017-08-14 15:42:25 -04:00
Mike Place	5e930b8cbd	If we catch the pid file in a transistory state, return None	2017-08-14 12:23:27 -07:00
Mike Place	52bce329cb	Merge pull request #42861 from twangboy/win_pkg_install_salt ... Fix pkg.install salt-minion using salt-call	2017-08-14 12:07:22 -07:00
Nicole Thomas	d2b6ce327a	Merge pull request #42709 from whiteinge/doc-token_expire_user_override ... Add token_expire_user_override link to auth runner docstring	2017-08-14 15:03:05 -04:00
amalleo25	4e46c968e6	Update joyent.rst ... Missing colon in example cloud.profiles.d config file.	2017-08-14 14:35:50 -04:00
Dmitry Kuzmenko	cdb48126f7	Make lint happier.	2017-08-14 14:34:33 -04:00
Dmitry Kuzmenko	62eca9b00b	Execute fire_master asynchronously in the main minion thread. ... In another case it will block minion execution if master is not responding. This is actual for MultiMaster configuration because blocks minion to respond to the active master requests if another one is down.	2017-08-14 14:34:33 -04:00
Mike Place	c6a7bf02e9	Merge pull request #42848 from DSRCorporation/bugs/42753_mmaster_timeout ... Execute fire_master asynchronously in the main minion thread.	2017-08-14 11:28:38 -07:00
twangboy	ffb23fbe47	Remove the line that wipes out the cache	2017-08-14 12:26:27 -06:00
Nicole Thomas	6a3279ea50	Merge pull request #42911 from gtmanfred/2017.7 ... cloud driver isn't a provider	2017-08-14 13:47:15 -04:00
twangboy	a3becf8342	Change service shutdown timeouts ... Windows default for stopping a service is 30 seconds. This changes the default timeouts for the salt-minion service to more closely resemble how it is handled in Windows. This gives Python a chance to cleanly exit before being forcibly closed.	2017-08-14 11:19:09 -06:00
Daniel Wallace	99046b441f	cloud driver isn't a provider ... This will not have a ':' in it at all.	2017-08-14 10:26:21 -06:00
Nicole Thomas	b9f4f87aa5	Merge pull request #42798 from s-sebastian/2016.11 ... Update return data before calling returners	2017-08-14 11:51:29 -04:00
garethgreenaway	4456f7383d	Merge pull request #42860 from skizunov/develop7 ... hash_and_stat_file should return a 2-tuple	2017-08-14 08:44:54 -07:00
Dmitry Kuzmenko	afedd3b654	Typos and version fixes in the doc.	2017-08-14 18:08:40 +03:00
Nicole Thomas	c6ca7d639f	Merge pull request #42889 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-08-14 10:16:19 -04:00
Nicole Thomas	4b6fe2ee59	Merge pull request #42898 from mirceaulinic/patch-11 ... Minor eos doc correction	2017-08-14 09:42:20 -04:00
Dmitry Kuzmenko	9fedf6012e	Fixed 'test_valid_docs' test.	2017-08-14 10:54:16 +03:00
Mircea Ulinic	93be79a135	Index eos under the installation instructions list	2017-08-12 23:15:11 +01:00
Mircea Ulinic	f903e7bc39	Minor eos doc correction	2017-08-12 23:11:25 +01:00
Aneesh Agrawal	86ce7004a2	Backport salt.utils.versions from develop to 2016.11 ... This makes it easier to backport boto* and other modules from develop that are using the salt.utils.versions module. Additionally, because the `blacklisted-module` Salt pylint module is not available in 2016.11, remove references to it.	2017-08-11 23:41:56 +00:00
rallytime	fb7117f2ac	Use salt.utils.versions.LooseVersion instead of distutils	2017-08-11 16:31:24 -04:00
Erik Johnson	1764878754	Merge pull request #42883 from rallytime/fix-boto-tests ... Fix failing boto tests	2017-08-11 15:29:11 -05:00
Dmitry Kuzmenko	999388680c	Make chunked mode in salt-cp optional (disabled by default). ... This reverts breaking of backward compatibility related to the cp.recv interface change.	2017-08-11 22:44:42 +03:00
rallytime	29ff19c587	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/config/__init__.py - salt/states/dockerng.py - salt/utils/cloud.py	2017-08-11 15:17:19 -04:00
Nicole Thomas	b21778efac	Merge pull request #42885 from terminalmage/fix-f26-tests ... Move weird tearDown test to an actual tearDown	2017-08-11 15:14:41 -04:00
Nicole Thomas	c15d0034fe	Merge pull request #41977 from redmatter/fix-dockerng-network-ignores-test ... Fix dockerng.network_* ignoring of tests=True	2017-08-11 14:37:19 -04:00
Nicole Thomas	3b9c3c5671	Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs ... Adding missing output flags to salt cli docs	2017-08-11 14:35:18 -04:00
garethgreenaway	9868ab6f3b	Merge pull request #42887 from rallytime/fix-42870 ... Remove extraneous "deprecated" notation	2017-08-11 11:34:24 -07:00
rallytime	71e7581a2d	Remove extraneous "deprecated" notation ... This deprecated notation was supposed to be on the "useradd_all" function, but somehow was moved to the "useradd" function. Fixes #42870	2017-08-11 14:31:17 -04:00
Carson Anderson	885bee2a7d	Stub out required functions for redis cache ... Without these functions the masters are not able to use the redis cache completely Signed-off-by: Carson Anderson <ca@carsonoid.net>	2017-08-11 12:22:04 -06:00
rallytime	6a7bf99848	Lint fix: add missing space	2017-08-11 14:19:15 -04:00
Nicole Thomas	e5b98c8a88	Merge pull request #42882 from gtmanfred/2016.11 ... make sure cmd is not run when npm isn't installed	2017-08-11 13:53:14 -04:00