93078 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	7070a3be48	Update default renderer to jinja|yaml, improve renderer docs ... `yaml_jinja` and all legacy renderer syntax has been transparently translated to the render pipeline syntax (e.g `jinja|yaml`) under-the-hood for several years now, this just makes the default renderer adhere to the render pipeline syntax. It also makes significant improvements to the renderer documentation.	2018-04-16 22:35:23 -05:00
Mike Place	c55c97527c	Merge pull request #47099 from sieben/cloud_providers_salt ... Add Scaleway to cloud providers examples	2018-04-16 08:44:14 -06:00
Rémy Léone	e11dca08ac	Add Scaleway to cloud providers examples	2018-04-16 15:43:03 +02:00
Nicole Thomas	68546d27ea	Merge pull request #46890 from MaximilianMeister/pymysql-returner ... fall back to PyMySQL	2018-04-13 09:26:56 -04:00
Maximilian Meister	e83e98d968	fall back to PyMySQL ... same is already done in modules (see #26803) Signed-off-by: Maximilian Meister <mmeister@suse.de>	2018-04-13 09:08:57 +02:00
Mike Place	9e13b5fd81	Merge pull request #46892 from samilaine/update-doc-topics-event-events ... Working Python examples for the event documentation.	2018-04-12 13:59:56 -06:00
Mike Place	81359e3124	Merge pull request #46996 from gtmanfred/vault ... add unseal for vault runner	2018-04-12 13:53:17 -06:00
Mike Place	800a91bf45	Merge pull request #47005 from ari/patch-3 ... Remove salt FreeBSD repo which is now 2 years out of date	2018-04-12 13:52:03 -06:00
Nicole Thomas	24d275154a	Merge pull request #47035 from terminalmage/fix-decorator-path ... Fix incorrect decorator path in salt/modules/lxd.py	2018-04-12 15:23:28 -04:00
Nicole Thomas	e1e2bd3d4a	Merge pull request #47034 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-04-12 14:59:00 -04:00
Erik Johnson	193a896fd5	Fix incorrect decorator path in salt/modules/lxd.py ... NOTE: This bug only exists in develop	2018-04-12 11:41:36 -05:00
rallytime	fe10957ce0	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/cloud/clouds/azurearm.py	2018-04-12 11:00:14 -04:00
Nicole Thomas	9cf3c6406a	Merge pull request #47026 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-12 10:39:40 -04:00
Daniel Wallace	d3be828696	Merge pull request #47021 from garethgreenaway/920_state_module_jinja_filters_test_test_path_which ... [2018.3] Fixing integration.modules.test_state_jinja_filters.StateModuleJinjaFiltersTest.test_path_which	2018-04-12 08:12:38 -05:00
Nicole Thomas	66e8445b82	Merge pull request #47022 from corywright/add-auth-file-module-to-docs ... Add auth.file module to auth documentation page	2018-04-11 17:11:09 -04:00
rallytime	ba70df9d62	Use msgpack utils for loads call, import msgpack for UnpackValueError	2018-04-11 14:38:32 -04:00
Mike Place	cbe1cfa4d9	Merge pull request #46684 from isbm/isbm-saltssh-multimajor-py-version-support ... SaltSSH cross-major version support	2018-04-11 12:31:31 -06:00
Mike Place	4e44fee506	Merge pull request #46022 from bloomberg/nested-orch-highstate ... salt.outputter.highstate: recursion for orch	2018-04-11 12:22:14 -06:00
Nicole Thomas	6e285fb8f2	Merge pull request #46994 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-04-11 14:03:31 -04:00
rallytime	34a478dfe5	Update old fopen path with new utils files path	2018-04-11 12:44:04 -04:00
rallytime	590c7fc13f	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/state.py - salt/utils/files.py - tests/integration/modules/test_pip.py	2018-04-11 12:41:22 -04:00
Nicole Thomas	62d49e8576	Merge pull request #46997 from LukeCarrier/fix-docker-slsbuild-typo ... Fix respository (=> repository) typo in sls_build	2018-04-11 11:53:32 -04:00
Cory Wright	bd0918fc40	Add auth.file module to auth documentation page	2018-04-11 11:40:00 -04:00
Daniel Wallace	0046646065	add unseal for vault runner	2018-04-11 10:19:23 -05:00
Gareth J. Greenaway	2ccf2c5fe0	Fixing test_path_which to check that the filter is available rather than results.	2018-04-11 08:19:07 -07:00
rallytime	b67e86e11b	Fix poor merge-conflict resolution: "translate_new_lines" doesn't exist in develop.	2018-04-11 10:48:48 -04:00
Nicole Thomas	1d1c9f71b5	Merge pull request #45313 from NTmatter/45274-trafficserver-popen-arguments ... modules.trafficserver: Use lists for popen's commands and arguments	2018-04-11 10:34:00 -04:00
Nicole Thomas	12ecfdee93	Merge pull request #45774 from twangboy/mac_add_service_util ... Fix __virtual__ issue in mac_system.py	2018-04-11 10:26:12 -04:00
Bo Maryniuk	515a83a72a	Set master_top_first to False by default	2018-04-11 16:20:32 +02:00
Nicole Thomas	8f994e7cf9	Merge pull request #46539 from jfoboss/patch-1 ... #46504 Fix	2018-04-11 10:13:23 -04:00
Nicole Thomas	6239033541	Merge pull request #47014 from brejoc/develop-fix-for-grain-test-core ... Test is now also working with Python2	2018-04-11 10:10:42 -04:00
Nicole Thomas	79347f108a	Merge pull request #47012 from terminalmage/issue46953 ... Azure: ensure subscription_id is a str type	2018-04-11 09:57:07 -04:00
Jochen Breuer	c22c81304f	Test is now also working with Python2 ... Since assertCountEqual was Python>=3.2 only, we backported this to Python2.	2018-04-11 10:51:20 +02:00
Erik Johnson	5192622a32	Azure: ensure subscription_id is a str type ... Resolves #46953.	2018-04-11 02:21:27 -05:00
jfoboss	6890122e41	Merge pull request #1 from twangboy/pull_46539 ... Fix unit test for win_ntp	2018-04-11 10:01:53 +03:00
Ari Maniatis	5db36d7bdb	Remove salt FreeBSD repo which is now 2 years out of date ... The saltstack repository has the 2016 version is current. Its not being updated, but there is a perfectly good port in the FreeBSD tree to use instead. Enhance the documentation on how to install that from binary or source.	2018-04-11 08:39:26 +10:00
Nicole Thomas	74d70e95a5	Merge pull request #46999 from gtmanfred/2017.7 ... switch pip test package	2018-04-10 17:18:32 -04:00
Nicole Thomas	d61fdd97fb	Merge branch 'develop' into nested-orch-highstate	2018-04-10 16:55:57 -04:00
twangboy	5796696617	Fix tests for Py3 ... readPlistFromString has been deprecated on Python3. Use loads instead.	2018-04-10 14:45:32 -06:00
twangboy	7b40218790	Fix lint, remove sentence from docstring	2018-04-10 14:45:32 -06:00
twangboy	781880f0fc	Add _available_services function for testing	2018-04-10 14:45:31 -06:00
twangboy	6080633613	Add assert_called_with	2018-04-10 14:45:31 -06:00
twangboy	1bf70b2033	Add more tests for available_services	2018-04-10 14:45:30 -06:00
twangboy	b429fc3e74	Add tests for mac_utils ... Need help with the `available_services` tests	2018-04-10 14:45:30 -06:00
twangboy	b5f67130cc	Used *args and **kwargs	2018-04-10 14:45:30 -06:00
twangboy	ed061617a2	Fix unicode_literal issue in mac_assistive	2018-04-10 14:45:29 -06:00
twangboy	82e17e5fc8	Fix args/kwargs	2018-04-10 14:45:29 -06:00
twangboy	455146500a	Move some functions into mac_utils	2018-04-10 14:45:28 -06:00
twangboy	125586264b	Add utils\mac_service.py	2018-04-10 14:45:28 -06:00
Mike Place	511c8fa04d	Merge branch 'develop' into 45274-trafficserver-popen-arguments	2018-04-10 14:11:07 -06:00