8881 Commits

Author	SHA1	Message	Date
Mike Place	bfce09c2fe	Merge pull request #49937 from ssc-services/fix-virt-what-multiline-results ... Fix value of `virtual` grain when using `virt-what`	2018-10-19 07:27:42 -06:00
Elias Probst	08b1b17465	Add release notes for virtual grain fix	2018-10-19 01:03:25 +02:00
rallytime	82e73fe49d	Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/ref/tops/all/index.rst - salt/fileclient.py - salt/grains/core.py - salt/modules/win_file.py - salt/pillar/__init__.py - salt/utils/http.py	2018-10-18 10:41:42 -04:00
Mike Place	f7f8cb533f	Merge pull request #50094 from rallytime/doc-errs ... Fix varstack_top naming in docs	2018-10-18 12:49:24 +02:00
rallytime	1fbb84d934	Fix varstack_top naming in docs ... Warnings were generated in the doc builds about how `varstack` doesn't exist. The file is named `varstack_top`.	2018-10-17 10:31:45 -04:00
Mike Place	b94e0a01ac	Merge pull request #50055 from rallytime/bp-50024 ... Back-port #50024 to 2018.3	2018-10-16 11:14:06 +02:00
Mike Place	14f3fac0c4	Merge pull request #50056 from rallytime/bp-50029 ... Back-port #50029 to 2018.3	2018-10-16 11:12:58 +02:00
Daniel Wallace	4c4bb5a489	Merge pull request #49987 from terminalmage/pillar_roots ... Make Pillar no longer munge file_roots	2018-10-15 16:58:08 -05:00
rallytime	1eaaab705f	Doc title formatting must match doc name length	2018-10-15 16:55:35 -04:00
Christian McHugh	6ac26b6c1e	add saltclass docs from release notes	2018-10-15 16:54:20 -04:00
rallytime	1b5b018da2	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/minion.py - salt/states/lvm.py	2018-10-15 13:13:57 -04:00
Cody Crawford	2e46a783c5	Expose docs for Ansible modules	2018-10-15 13:01:22 -04:00
rwaweber	1ea72a00aa	docs: Correct spelling mistake and smooth out sentence	2018-10-15 12:58:28 -04:00
rallytime	e3a0f7b6f2	Add gce fix to 2017.7.9 release notes	2018-10-15 11:03:06 -04:00
Joachim Gleissner	e6d86fca91	document GCE instance credentials configuration	2018-10-15 11:02:25 -04:00
rallytime	f8e73e8ae2	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/beacons/inotify.py	2018-10-10 15:13:23 -04:00
Erik Johnson	58f5fde03c	Make Pillar no longer munge file_roots ... Pillar and the local fileclient used to use the same class, but this changed a few years ago with the introduction of FSClient (which enabled non-roots fileserver backends in masterless Salt). Since Pillar is the only thing that uses this client, there is no longer a reason to make Pillar modify file_roots.	2018-10-10 13:10:50 -05:00
rallytime	32e7d90384	Add 2018.3.4 release notes file	2018-10-10 10:14:29 -04:00
rallytime	6c00003fd8	Add 2017.7.9 release notes file	2018-10-10 10:12:26 -04:00
rallytime	216fd64013	Remove event_publisher_pub_hwm and salt_event_pub_hwm from documentation ... Fixes #49925 The `event_publisher_pub_hwm` and `salt_event_pub_hwm` configuration options were removed in #38723. (They are obsolete and not used within salt any longer.) When those options were removed, I neglected to remove them from the docs. This PR cleans up the references in the docs.	2018-10-08 10:51:01 -04:00
rallytime	46c0e50638	Merge branch '2018.3' into 'fluorine' ... Conflicts: - doc/man/salt.7	2018-10-03 09:45:20 -04:00
rallytime	a65c60d862	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/state.py - salt/utils/hashutils.py - tests/integration/modules/test_state.py	2018-10-02 15:09:51 -04:00
Erik Johnson	108c026e1d	Fix additional references to Fluorine in matcher docs	2018-10-02 11:53:13 -05:00
C. R. Oldham	853740d00b	Change versionadded to Neon	2018-10-02 11:49:40 -05:00
Paulo-Nunes	fb6f81835a	Edit requisite documentation ... Fixes #49836	2018-10-01 21:08:49 -04:00
Nicole Thomas	ec978061aa	Merge pull request #49764 from garethgreenaway/49520_multimaster_dns_issue_fix ... [2018.3] Adding retry_dns_count to minion	2018-10-01 10:20:02 -04:00
rallytime	81b0aa7099	Add "in progress" notation back to the 2018.3.3 release notes ... This has been removed in the 2018.3.3 branch for release prep, but the docs on the main website still need to say this is in progress until we release.	2018-10-01 09:17:50 -04:00
rallytime	0e761036f1	Merge branch '2018.3.3' into '2018.3' ... No conflicts.	2018-09-30 12:39:44 -04:00
Gareth J. Greenaway	741928bfee	Fixes per request from @rallytime.	2018-09-27 08:44:06 -07:00
Gareth J. Greenaway	e66dc18805	Updating the resolve_dns function in minion.py to include a new minion configuration option which will control how many attempts will be made when the master hostname is unable to be resolved before giving up.	2018-09-27 08:44:06 -07:00
Nicole Thomas	1db2d2e4d0	Merge pull request #48809 from cro/matcher_in_loader2 ... Matcher in loader, take 4	2018-09-26 09:22:39 -04:00
rallytime	7e0db5cb15	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/cloud/clouds/azurearm.py	2018-09-25 15:18:00 -04:00
Megan Wilhite	0b254373b1	Merge pull request #49743 from Ch3LL/8.3_in_progress ... Remove In Progress note for 2018.3.3 release	2018-09-21 16:33:17 -04:00
Megan Wilhite	f2810b8736	Merge pull request #49742 from Ch3LL/man_8.3 ... Update man pages for 2018.3.3	2018-09-21 16:32:54 -04:00
Ch3LL	3043b0890f	Remove In Progress note for 2018.3.3 release	2018-09-21 16:28:49 -04:00
Ch3LL	a418ef87b1	Update man pages for 2018.3.3	2018-09-21 16:18:36 -04:00
Ch3LL	aef85d3b3f	Add Changelog for 2018.3.3	2018-09-21 14:22:04 -04:00
C. R. Oldham	85ac68b62c	Clarify doc	2018-09-21 09:36:02 -06:00
C. R. Oldham	2495d48f49	Add docs for loadable matchers.	2018-09-21 09:35:52 -06:00
Erik Johnson	8393560642	Add warning about using jinja filters to dump dicts in Jinja	2018-09-20 14:56:26 -05:00
rallytime	9298304ce9	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-09-19 14:07:06 -04:00
rallytime	b39dacf06c	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/pillar/cmd_yamlex.py	2018-09-18 10:08:16 -04:00
Erik Johnson	7e5bab78c5	Fix docs build errors (2017.7 branch)	2018-09-17 22:35:08 -06:00
rallytime	c274635933	Fix some doc build warnings	2018-09-17 16:20:05 -04:00
rallytime	49afc328b5	Merge branch '2018.3' into 'fluorine' ... Conflicts: - .github/CODEOWNERS	2018-09-07 16:21:13 -04:00
rallytime	cf508a4a50	Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/opt.txt - requirements/tests.txt - salt/modules/win_service.py - tests/integration/states/test_service.py	2018-09-06 12:08:01 -04:00
rallytime	862c44c036	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-09-05 09:41:04 -04:00
rallytime	de7ef3d681	Add "in progess" notation back to 2017.7.8 release notes ... We need this notation in the branch for now. We will remove it once the release is live.	2018-09-05 09:39:14 -04:00
rallytime	edad2dcda9	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-09-05 09:36:33 -04:00
Ch3LL	d40b6444a1	Update 2017.7.8 ChangeLog with new fixes	2018-09-04 17:28:50 -04:00