8773 Commits

Author	SHA1	Message	Date
Nicole Thomas	8c5b369be0	Merge pull request #48660 from garethgreenaway/jids_in_logs ... [develop] Adding jids in master & minion logs	2018-08-03 11:22:56 -04:00
Mircea Ulinic	7722544f92	Add netbox Pillar to autodoc	2018-08-03 10:38:53 +01:00
Gareth J. Greenaway	f8f6ff89ff	Merge branch 'develop' into jids_in_logs	2018-08-02 18:03:45 -07:00
Nicole Thomas	d7110e89ab	Merge pull request #48872 from mglaske/patch-1 ... Update writing.rst	2018-08-02 15:22:00 -04:00
Nicole Thomas	7fe663af33	Merge pull request #48864 from rallytime/pkg-deprecation ... Remove support for virtual packages in the pkg state	2018-08-02 14:06:12 -04:00
Nicole Thomas	93c5955d8f	Merge pull request #48859 from mirceaulinic/cisco-ios-cfg ... Add module for Cisco IOS configuration manipulation	2018-08-02 07:28:14 -04:00
Michael Glaske	6545ec7bcc	Update writing.rst ... We identified this issue, which was very difficult to track down. Don't think it's really a bug, and likely state names should never contain a hyphen anyways. But basically it renders the name as (first - second) = function(). (first-second.py), and you get a "can't assign to operator" exception.	2018-08-01 18:13:21 -04:00
Nicole Thomas	60bbdee877	Merge pull request #48344 from gtmanfred/proxycaller ... allow using proxy minion from cli	2018-08-01 14:39:44 -04:00
Nicole Thomas	c8df9e8b5a	Merge pull request #48854 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-08-01 12:39:31 -04:00
rallytime	3f1c6a59a5	Remove support for virtual packages in the pkg state ... Refs #47375 and #47396	2018-08-01 12:32:21 -04:00
Nicole Thomas	4b533d341e	Merge pull request #48823 from rallytime/fluorine-deprecations-nochown ... Remove deprecation warnings for "no_chown" option	2018-08-01 12:23:56 -04:00
Nicole Thomas	48bcef9b58	Merge pull request #48688 from mirceaulinic/peeringdb-mod ... A new execution module: PeeringDB	2018-08-01 10:10:48 -04:00
Mircea Ulinic	2d78646612	Autodoc for the iosconfig module	2018-08-01 13:06:00 +00:00
Gareth J. Greenaway	121d68b2a5	Merge branch 'develop' into jids_in_logs	2018-07-31 16:09:56 -07:00
rallytime	4bcdf16e21	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/mac_brew.py - salt/utils/minions.py - tests/integration/states/test_file.py	2018-07-31 16:56:07 -04:00
Nicole Thomas	ed3d85be98	Merge branch 'develop' into proxycaller	2018-07-31 16:30:22 -04:00
Nicole Thomas	232db0a967	Merge pull request #48733 from mirceaulinic/ciscoconfparse-mod ... Add ciscoconfparse execution module for various text config mainipulations	2018-07-31 15:13:28 -04:00
Gareth J. Greenaway	16172dc0bc	Documentation fix.	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	cc14dff8a8	Adding information about log_fmt_jid to logging documentation	2018-07-31 09:19:06 -07:00
Gareth J. Greenaway	3b8a4eed17	Adding some notes to the Fluorine release notes. Adding the default format for log_fmt_jid.	2018-07-31 09:19:06 -07:00
Nicole Thomas	1488a89983	Merge branch 'develop' into ciscoconfparse-mod	2018-07-31 11:40:00 -04:00
rallytime	4a51ed6ccf	Remove deprecation warnings for "no_chown" option ... The `no_chown` option in various functions was marked for removal in Fluorine. This PR removes those warnings and updates the releaes notes accordingly. This PR also updates some of the Fluorine references in the zfs module as the documentation can be more specific.	2018-07-30 13:24:38 -04:00
rallytime	f46d4e0a26	[develop] Fluorine deprecations in cloud util (and related functions) ... Since `Fluorine` was misspelled in a couple of places and subsequently fixed, the removal of the `cache_nodes_ip` function was missed. This PR removes the deprecated `cache_nodes_ip` function from salt.utils.cloud. This PR also updates some of the warn_util versions to match the removal/support warning message. The `warn_util` version was set to `Fluorine`, but the "will be removed in version" message stated Sodium. Sodium is the correct version, so the docs and warn_util versions have been corrected.	2018-07-30 11:46:13 -04:00
Mike Place	c936aaa64d	Merge branch 'develop' into proxycaller	2018-07-27 10:26:53 -06:00
rallytime	436510796f	Merge branch '2017.7' into '2018.3' ... No conflicts.	2018-07-27 11:44:07 -04:00
rallytime	5123b17ffd	Update linting docs to contain .testing.pylintrc use ... The PR tests use the ``.testing.pylintrc`` file, rather than the more restrictive ``.pylintrc`` file. This can be a point of confusion when following the current documentation. The docs should reference the testing file and that the Jenkins PR tests use ``.testing.pylintrc`` instead of ``.pylintrc``. Fixes #48417	2018-07-27 09:09:28 -04:00
Nicole Thomas	f05b86979a	Merge branch 'develop' into fix-40532	2018-07-26 14:20:48 -04:00
Nicole Thomas	a7dc3ddcc8	Merge pull request #48762 from mirceaulinic/rm-template-mod ... Get rid of the template module and rework a couple of modules	2018-07-26 11:42:15 -04:00
Mircea Ulinic	2ce61a3377	Add the PeeringDB execution module to autodoc	2018-07-26 06:49:23 +00:00
Nicole Thomas	816f7edc81	Merge pull request #48716 from thetoolsmith/develop ... add salt cloud support for block device tagging or root devices and such	2018-07-25 11:07:56 -04:00
Ch3LL	e760c8466a	Update Saltstack Logo banner on docs.saltstack.com	2018-07-25 10:43:37 -04:00
Ch3LL	0cb4bac798	Update Saltstack Logo banner on docs.saltstack.com	2018-07-25 10:41:43 -04:00
Mircea Ulinic	11fe1fc010	Revert "Adding the template module for autodoc" ... This reverts commit e369357ff3.	2018-07-25 08:30:16 +00:00
Paul Bruno	0d4ad6eac1	improve document example	2018-07-24 16:31:08 -04:00
Paul Bruno	faa57c76a8	make recommended changes, update documentation	2018-07-24 16:27:46 -04:00
Ch3LL	73b1fc29f0	Update Saltstack Logo banner on docs.saltstack.com	2018-07-24 16:01:49 -04:00
Nicole Thomas	8958c30d13	Merge pull request #48687 from mirceaulinic/jira-mod ... Adding a new execution module to manipulate JIRA tickets	2018-07-24 13:48:47 -04:00
Nicole Thomas	968e2e0b9e	Merge pull request #48713 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-07-24 13:39:30 -04:00
rallytime	1397d72efe	Update DOCBANNER with new SaltConf18 image ... And remove enterprise ad	2018-07-24 13:16:32 -04:00
rallytime	dbc1f8b772	Update DOCBANNER with new SaltConf18 image ... And remove enterprise ad	2018-07-24 13:14:42 -04:00
rallytime	6df8fd8652	Update DOCBANNER with new SaltConf18 image ... And remove enterprise ad	2018-07-24 12:44:19 -04:00
Mircea Ulinic	e4d03b8831	The napalm module has been renamed, updating the autodoc	2018-07-24 13:01:51 +00:00
Mircea Ulinic	32b17bfa72	Add ciscoconfparse mdoule to autodoc	2018-07-24 12:49:28 +00:00
Nicole Thomas	70e75c2be6	Merge branch 'develop' into jira-mod	2018-07-23 18:15:15 -04:00
Nicole Thomas	031741f079	Merge pull request #48697 from dgengtek/feature/ldap-starttls ... Feature: ldap authentication with starttls	2018-07-23 15:43:50 -04:00
rallytime	597fc8009b	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/grains/core.py	2018-07-23 11:54:19 -04:00
Mircea Ulinic	2ae5a26d05	Add autodoc for the modules.jira_mod	2018-07-23 14:12:20 +00:00
Marc-Aurèle Brothier	54fa5f231e	cloudstack: fix wrong attribute name in doc	2018-07-23 15:55:54 +02:00
Nicole Thomas	9d176ab8e3	Merge branch 'develop' into fix-40532	2018-07-23 09:39:09 -04:00
Erik Johnson	7ad832c901	Add missing release notes mention of file.blockreplace changes ... These were added to the docstrings but not to the release notes for the releases where the change took place.	2018-07-21 10:12:52 -05:00