5307 Commits

Author	SHA1	Message	Date
C. R. Oldham	9c03423ba0	Fix weird merge conflict	2019-06-18 15:02:52 -06:00
C. R. Oldham	96431972ac	Add event_listen_queue_max_seconds to fix #53411	2019-06-18 15:02:45 -06:00
Jim McStanton	bada5a184e	Cleared up sentence in unit test docs	2019-06-14 09:30:16 -05:00
twangboy	5a6c18106f	Fix some Jinja docs	2019-04-24 12:09:03 -06:00
Akmod	d5ad46ccb9	Solves https://github.com/saltstack/salt/issues/52557	2019-04-18 10:30:45 -06:00
Megan Wilhite	bda3ca2071	Merge pull request #51749 from terminal-labs/salt-cloud-map-alt-update ... Salt cloud map alt update	2019-03-28 09:52:26 -04:00
Daniel Wozniak	14a6b9d417	Merge pull request #52306 from terminal-labs/replace-ping-with-version ... Replaced `test.ping` with `test.version`	2019-03-27 15:50:06 -07:00
Alan Cugler	9ca0f72308	Changed where to mention the map files compatibility for minion configuration options. ... This is a result of @Ch3LL suggestion on the PR itself for this doc change.	2019-03-27 12:42:03 -05:00
Alan Cugler	364ef065e8	Added mention of map file alternative for minion configuration options. ... Fixes: #51127	2019-03-27 12:42:03 -05:00
Megan Wilhite	8255901b33	document regex_replace Jinja filter (#52326) ... Fixes #48952.	2019-03-27 10:14:07 -06:00
Alan Cugler	e8c8dba161	Added in an explaination of the --zone flag ... approved in #52251	2019-03-25 16:10:29 -05:00
Alan Cugler	0b1eb00dc4	Replaced test.ping with test.version ... Result of issue #52277 Any where `test.ping` still exists in the docs was left because of the context in those docs.	2019-03-25 12:09:48 -05:00
Gareth J. Greenaway	08728cf660	Merge branch '2018.3' into replace-github-dead-link	2019-03-22 11:32:15 -07:00
Alan Cugler	62e54044fc	github issue tracker link and sends you to the url for listed issues.	2019-03-18 16:18:40 -05:00
Alan Cugler	842ec84186	Merge branch '2018.3' into docs-sphinx-ref-deadlink-fix	2019-03-18 14:32:32 -05:00
Gareth J. Greenaway	f68caa633f	Merge branch '2018.3' into bp-47005	2019-03-15 18:09:24 -07:00
Megan Wilhite	d1700f3afc	Merge branch '2018.3' into bp-47005	2019-03-15 12:03:50 -04:00
Max Arnold	75acce19f1	Rename obsolete beacon validation function	2019-03-15 18:28:12 +07:00
Ch3LL	25ae7c8873	remove freebsd-upstream reference	2019-03-14 17:41:21 -04:00
Ari Maniatis	b70c45c297	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.	2019-03-14 17:40:18 -04:00
Ch3LL	7ad4758f6f	Update device names in proxy getting started docs	2019-03-08 12:51:08 -05:00
Megan Wilhite	b217f948ee	Merge branch '2018.3' into py3_doc	2019-03-07 10:59:51 -05:00
Ch3LL	605bfaf7c5	Update futures dependency for python2 only	2019-03-07 10:59:01 -05:00
Gareth J. Greenaway	faa3471c05	Merge branch '2018.3' into 2018.3	2019-03-05 17:42:18 -08:00
Ch3LL	9adc19eeb1	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/conf.py - salt/modules/zfs.py	2019-03-05 14:08:35 -05:00
Daniel Wozniak	92752071c4	Merge branch '2017.7' into docs-sphinx-ref-deadlink-fix	2019-03-05 03:08:36 -07:00
Daniel Wozniak	a6891778ec	Merge pull request #51807 from Ch3LL/2018.3.5_rn ... Add 2018.3.5 release notes	2019-03-05 02:27:23 -07:00
Daniel Wallace	8572c17091	rename kubernetes module to kubernetesmod ... This makes sure this doesn't import the kubernetes module from salt/modules while the kubernetes python module is not installed	2019-03-01 13:33:50 -06:00
Ch3LL	072cd84c7d	Update supported python versions in installation docs	2019-03-01 14:29:50 -05:00
Ch3LL	9a681367a6	Update release documentation	2019-03-01 10:21:02 -05:00
Ch3LL	2c0b85c8f6	Add 2018.3.5 release notes	2019-02-25 16:31:34 -05:00
Alan Cugler	1f00c89fca	Added in python 3 server according to the consensus from #51748	2019-02-22 15:22:10 -06:00
Alan Cugler	8d70e3bbb5	Replaced all bad sphinx links with ones from the new sphinx doc site.	2019-02-22 11:27:47 -06:00
Alan Cugler	ebdffcdc42	replaced two python sphinx deadlinks with sphinx new relevant ... documentation pages.	2019-02-21 14:42:47 -06:00
Alan Cugler	ccf6a06c7e	Replaced a dead link for github issue tracker with another github ... link for the issue tracker and added a link to show more options for closing issues in commit messages.	2019-02-21 14:13:24 -06:00
Alan Cugler	bfb9d87af7	added the python3 command for startign the python http server.	2019-02-21 12:20:08 -06:00
Daniel Wozniak	e3d5fbe947	Merge pull request #51577 from garethgreenaway/merge-2017.7 ... [2018.3] Merge forward from 2017.7 to 2018.3	2019-02-13 01:11:10 -07:00
Daniel Wozniak	5bb9b323fe	Merge pull request #51393 from garethgreenaway/various_documentation_fixes ... [2018.3] Various documentation fixes	2019-02-12 22:34:55 -07:00
Gareth J. Greenaway	c337fcee4c	Merge branch '2018.3' into merge-2017.7	2019-02-11 14:51:33 -08:00
Gareth J. Greenaway	e891b3f515	Merge branch '2018.3.4' into merge-2018.3.4 ... Conflicts: tests/integration/states/test_file.py tests/unit/states/test_file.py tests/unit/utils/test_dns.py	2019-02-11 10:46:53 -08:00
Gareth J. Greenaway	a04177518f	Merge branch '2017.7' into merge-2017.7 ... Conflicts: salt/modules/pillar.py salt/states/pip_state.py salt/utils/data.py tests/unit/modules/inspectlib/test_fsdb.py tests/unit/output/test_json_out.py tests/unit/test_test_module_names.py	2019-02-11 09:01:46 -08:00
Daniel Wozniak	8bb7535888	Merge branch '2018.3' into various_documentation_fixes	2019-02-08 11:23:24 -07:00
Frode Gundersen	c6bfe53e8b	2018.3.4 releasenotes	2019-02-06 22:29:56 +00:00
Frode Gundersen	fb678ee990	fix escaped asterisks	2019-02-06 22:08:37 +00:00
Frode Gundersen	6a4f0da96b	2018.3.4 releasenotes	2019-02-06 21:10:51 +00:00
Mathieu Parent	7ca2aa4919	Allow dynamic file_roots ... Fixes: #48132	2019-02-06 21:33:11 +01:00
Gareth J. Greenaway	3582f6e209	Fixing the underline.	2019-01-31 10:30:58 -08:00
Gareth J. Greenaway	a8f42a0d42	Various documentation fixes.	2019-01-31 10:30:57 -08:00
Thomas S Hatch	f6a7cad822	Merge pull request #51225 from astronouth7303/loader-docs-2018.3 ... Loader docs 2018.3	2019-01-22 15:18:47 -07:00
Erik Johnson	41ae39067e	Merge pull request #51231 from terminalmage/issue51056 ... Clarify documentation for the the gitfs "all_saltenvs" config param	2019-01-22 11:33:19 -06:00