4992 Commits

Author	SHA1	Message	Date
Erik Johnson	b4e24a69e6	Move get_context to salt.utils.stringutils ... This avoids circular dependencies when salt.utils.jinja (which is imported by salt.utils.templates) needs to use get_context()	2018-02-07 02:09:56 -06:00
Erik Johnson	2feaaa3efc	Fix invalid Sphinx lexers in docs ... This clears up some warnings when we build the docs, and improves the syntax highlighting in the docs.	2018-02-02 09:21:07 -06:00
rallytime	0ad101d560	Merge branch '2017.7' into 'oxygen' ... Conflicts: - doc/man/salt.7 - salt/modules/git.py - salt/modules/pacman.py - salt/states/git.py - tests/integration/modules/test_mac_user.py - tests/support/parser/__init__.py	2018-01-26 17:27:03 -05:00
rallytime	f10c7ee92d	Merge branch '2017.7.3' into '2017.7' ... No conflicts.	2018-01-26 09:59:21 -05:00
Ch3LL	84c8216901	Add PRs to 2017.7.3 Release Notes	2018-01-25 15:51:34 -05:00
Dmitry Kuzmenko	99a0e1f7e2	Added M2Crytpo release note.	2018-01-25 20:32:00 +03:00
Dmitry Kuzmenko	a67fe51a5c	Fixed some tests, updated a doc.	2018-01-25 20:31:59 +03:00
rallytime	d4dac9f7cc	Merge branch '2016.11' into '2017.7' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1	2018-01-25 10:42:14 -05:00
Nicole Thomas	b2390e69ca	Merge pull request #45505 from DSRCorporation/bugs/raet_deprecation ... Deprecate RAET	2018-01-25 10:05:02 -05:00
Damon Atkins	1d21f86228	Update 2017.7.3.rst	2018-01-25 19:37:32 +11:00
Nicole Thomas	3a6837e232	Merge pull request #45675 from Ch3LL/rn_2016.11.9 ... Add new commits to 2016.11.9 release notes	2018-01-24 17:29:33 -05:00
Ch3LL	7b5bed36d9	Add new commits to 2016.11.9 release notes	2018-01-24 16:16:52 -05:00
Dmitry Kuzmenko	f88bbbe147	Raet deprecation warning and release note.	2018-01-24 22:49:18 +03:00
rallytime	1b4744165b	Add auth error raising change to oxygen release notes	2018-01-24 14:03:35 -05:00
rallytime	3c298afa72	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/modules/pip.py - salt/modules/reg.py - salt/modules/win_pkg.py - salt/runners/manage.py - salt/states/pkg.py - salt/transport/zeromq.py - salt/utils/event.py - tests/integration/modules/test_pip.py - tests/integration/states/test_user.py - tests/unit/grains/test_core.py - tests/unit/states/test_archive.py - tests/unit/utils/test_boto.py	2018-01-23 13:26:43 -05:00
Denys Havrysh	35675fe6b3	[DOC] Fix references on Salt Formulas page	2018-01-22 11:16:39 +02:00
Nicole Thomas	0d622f92a9	Merge pull request #45542 from UtahDave/doc_mixed_transports ... Add warning about using mixed transports	2018-01-19 16:44:30 -05:00
Nicole Thomas	c70b9dc20b	Merge pull request #45565 from Ch3LL/r-notes-2016 ... Add PR changes to 2016.11.9 Release Notes	2018-01-19 16:36:12 -05:00
Ch3LL	325f4cbcda	Add PR changes to 2016.11.9 Release Notes	2018-01-19 16:32:46 -05:00
David Boucha	b5b5054ec2	capitalize masters and minions	2018-01-19 12:58:13 -07:00
David Boucha	f542bdf566	Add warning about using mixed transports	2018-01-19 10:59:52 -07:00
rallytime	e0ffa32b49	Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/integration/modules/test_pkg.py	2018-01-19 10:09:36 -05:00
Nicole Thomas	28554ca935	Merge pull request #45389 from DSRCorporation/bugs/42626_pub_acl_doc ... Docs update for function args limit in pub acl.	2018-01-18 17:56:10 -05:00
Nicole Thomas	3dc3e4e690	Merge pull request #45412 from isbm/isbm-ssdp-spurious-errors-fix ... Isbm ssdp spurious errors fix	2018-01-18 07:07:01 -05:00
rallytime	4b64a3964e	Update function new name in release notes	2018-01-17 12:45:12 -05:00
Dmitry Kuzmenko	f33ebcada0	Doc note about user names regex matching in pub acl and eauth.	2018-01-17 17:49:19 +03:00
Denys Havrysh	0d79b9eaff	[DOC] Suggest to upgrade pygit2 and deps	2018-01-17 15:24:15 +02:00
rallytime	9f547a31f0	Merge branch '2016.11' into '2017.7'	2018-01-16 17:19:08 -05:00
Dmitry Kuzmenko	e29c0ff19e	Docs update for function args limit in pub acl.	2018-01-16 23:02:28 +03:00
Bo Maryniuk	59df24fc02	Docs update	2018-01-15 14:31:25 +01:00
Bo Maryniuk	b1bd992b1e	Add more doc fixes	2018-01-15 14:31:25 +01:00
Bo Maryniuk	5cc6daae09	Fix doc typos	2018-01-15 14:31:25 +01:00
Bo Maryniuk	b1b48f89db	Update autodiscovery documentation	2018-01-15 14:31:25 +01:00
Mircea Ulinic	6816e4f290	Document the utils refactor	2018-01-14 08:31:16 -05:00
Nicole Thomas	4d03162227	Merge pull request #45396 from rallytime/merge-oxygen ... [oxygen] Merge forward from 2017.7 to oxygen	2018-01-14 07:44:37 -05:00
Nicole Thomas	1755af821d	Merge pull request #44866 from DSRCorporation/slots3 ... Slots: use execution function return as a state arg value	2018-01-12 13:58:16 -05:00
rallytime	60370f5fb6	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/daemons/masterapi.py - salt/proxy/dummy.py - salt/states/file.py - tests/integration/modules/test_state.py - tests/integration/runners/test_runner_returns.py - tests/integration/ssh/test_state.py - tests/support/parser/__init__.py - tests/unit/grains/test_core.py - tests/unit/states/test_file.py	2018-01-11 16:00:08 -05:00
Damon Atkins	10a7501ede	Update release notes	2018-01-12 03:11:07 +11:00
Dmitry Kuzmenko	c205c10e89	Added Slots release note.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	fe87704ff2	Slots: @terminalmage code review fixes.	2018-01-11 14:05:58 +03:00
Dmitry Kuzmenko	b55bba0d46	Slots documentation.	2018-01-11 14:05:58 +03:00
rallytime	f65e091df8	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-01-10 10:15:19 -05:00
Erik Johnson	ef76bc6fcd	Update documentation for update intervals feature	2018-01-09 19:11:17 -06:00
Gareth J. Greenaway	edfc3dc078	Adding in documention for auth_events configuration option	2018-01-05 12:29:21 -08:00
rallytime	59076f5ee8	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/client/ssh/wrapper/state.py - salt/modules/yumpkg.py	2018-01-04 17:45:29 -05:00
Damon Atkins	325a9f0f66	Update 2016.11.9.rst	2018-01-05 01:51:14 +11:00
Damon Atkins	4da9200b9c	Update 2016.11.9.rst	2018-01-05 01:46:20 +11:00
Damon Atkins	126aee36ac	Update 2016.11.9.rst	2018-01-05 01:38:22 +11:00
Damon Atkins	1c01967943	Update 2016.11.9.rst	2018-01-05 01:36:57 +11:00
sumeetisp	1b4806e2b9	Updating python version ... As 2017.7 does not support python 2.6 documentation needs to be updated to reflect this dependency	2018-01-04 10:56:56 +05:30