4676 Commits

Author	SHA1	Message	Date
twangboy	6635b9003f	Fix winrm powershell script ... Removes the `Hostname` paramater in the winrm create command. It is not needed. It must match the hostname on the certificate, which is not defined in the case of the Remote Desktop certificate Removes extra spaces	2018-04-12 14:41:19 -06:00
Denys Havrysh	a1cc55da3d	[DOC] Remove mentions of COPR repo from RHEL installation page ... Fixes #28142	2018-03-28 12:30:07 +03:00
Erik Johnson	b4a1d34b47	Add option to return to pre-2017.7.3 pillar include merge order ... https://github.com/saltstack/salt/pull/45025 changed the pillar include merge order. This adds a new config option which allows a user to revert to the pre-2017.7.3 behavior.	2018-03-22 13:35:12 -05:00
Ch3LL	6076bfa2ee	Add changelog to 2017.7.5 release	2018-03-19 16:36:41 -04:00
Nicole Thomas	a188984cd9	Merge pull request #46446 from bdrung/fix-typos ... Fix various typos	2018-03-08 16:11:46 -05:00
Benjamin Drung	a3c54b50f6	Fix various spelling mistakes ... lintian found various spelling mistakes. Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2018-03-08 15:25:42 +01:00
Benjamin Drung	584b451fd1	Support dynamic pillar_root environment ... Allow users to specify a __env__ pillar_root directory that applies equally to all environments that are not explicitly specified. fixes #20581 Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>	2018-03-08 10:12:40 +01:00
Ch3LL	21aa848c89	Add mac py2 and py3 packages to mac installation docs	2018-03-06 11:09:33 -05:00
Denys Havrysh	d702846961	[DOC] Replace note rST block for GitHub	2018-02-27 16:53:39 +02:00
Ch3LL	6ddf3246ce	Add 2017.7.5 Release Notes File	2018-02-26 14:22:20 -05:00
Nicole Thomas	705caa8cca	Merge pull request #46148 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.3 to 2017.7	2018-02-23 14:21:38 -05:00
rallytime	25deebf7a6	Merge branch '2017.7.3' into '2017.7' ... Conflicts: - salt/modules/git.py	2018-02-22 10:22:22 -05:00
Erik Johnson	f9301fcc34	Document behavior when orchestration runnner invoked with non-orch states ... This also replaces some += usage with list.extend for a modest performance/memory improvement.	2018-02-21 20:36:30 -06:00
Denys Havrysh	d8fb051e44	[DOC] Fix code-blocks for reStructuredText	2018-02-21 15:37:57 +02:00
rallytime	4c2f504a85	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-02-20 17:43:33 -05:00
Denys Havrysh	2062fd0e5c	[DOC] Put https link to the formulas doc page	2018-02-19 12:59:00 +02:00
Wedge Jarrad	5a0fe104f7	Fix contributing doc typo	2018-02-18 10:57:28 -08:00
Ch3LL	8d0eeeb059	Update 2017.7.4 Release Notes with new fixes	2018-02-16 11:45:49 -05:00
Ch3LL	2a5d855d97	add required arg to dns_check jinja doc example	2018-02-16 10:48:57 -05:00
rallytime	a06645ce71	Merge branch '2017.7.3' into '2017.7' ... Conflicts: - doc/topics/releases/2017.7.4.rst - salt/utils/vault.py	2018-02-13 13:34:24 -05:00
Ch3LL	ac0baf4b34	Add 2017.7.4 Release Notes with PRs	2018-02-13 11:31:20 -05:00
twangboy	6d223cffa7	Add tip about passing bogus saltenv	2018-02-12 14:03:31 -07:00
twangboy	87dc554dc3	Add final updates to docs	2018-02-12 14:03:30 -07:00
twangboy	3646d5c897	Fix some docs formatting, add some warnings	2018-02-12 14:03:30 -07:00
rallytime	e4e4744218	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-02-08 10:42:37 -05:00
rallytime	f937e8ba81	Add release notes file for 2017.7.4 release	2018-02-06 09:57:22 -05:00
rallytime	104a24f244	Remove extraneous ] in release notes for 2016.11.9	2018-02-05 16:34:19 -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
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
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
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
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
Damon Atkins	10a7501ede	Update release notes	2018-01-12 03:11:07 +11:00
rallytime	f65e091df8	Merge branch '2016.11' into '2017.7' ... No conflicts.	2018-01-10 10:15:19 -05:00
Gareth J. Greenaway	edfc3dc078	Adding in documention for auth_events configuration option	2018-01-05 12:29:21 -08: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