1980 Commits

Author	SHA1	Message	Date
rallytime	7b9b3f700d	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/modules/dockerng.py - salt/states/dockerng.py	2017-02-22 16:27:08 -07:00
Ivan Babrou	55965ce505	Autodetect IPv6 connectivity from minion to master	2017-02-09 11:33:21 -08:00
rallytime	2f74dcf685	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
rallytime	6504bb6b02	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/modules/pillar.py - salt/states/archive.py - tests/integration/states/archive.py	2017-02-03 09:48:58 -07:00
Ivan Babrou	6ffeda3ee5	Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131) ... * Clarify ipv6 option for minion and inteface for master, closes #39118 * Add ipv6 reference	2017-02-02 08:35:00 -07:00
rallytime	b866427f59	Add a bunch of missing doc module references ... Also added an index.rst file for executors, renamed the azurearm.rst file (Was misspelled with "azureare"), and removed the xbps-pkg.rst file since that is an invalid reference.	2017-01-31 15:12:34 -07:00
rallytime	fdaa5ac1b0	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/master.py - salt/pillar/__init__.py - salt/utils/__init__.py	2017-01-26 14:09:37 -07:00
Erik Johnson	6b014e53fc	Rename on_demand_pillar to on_demand_ext_pillar	2017-01-25 15:08:57 -06:00
Erik Johnson	d216f90c63	Document new on_demand_pillar option and add to config template	2017-01-25 14:43:14 -06:00
Erik Johnson	42a3652620	Add top file merging docs to the master config file documentation ... Also put the top file stuff in its own section of the minion config file, along with a message explaining that these options are only used in masterless salt.	2017-01-23 20:38:03 -06:00
rallytime	30e8a66fb0	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/netapi/rest_tornado/saltnado.py - tests/integration/netapi/rest_tornado/test_app.py	2017-01-16 18:54:14 -07:00
Denys Havrysh	51d4707071	DOCS: add links to File State Backups page where necessary (#38735)	2017-01-14 11:49:21 -07:00
Yoram Hekma	57df3bf148	The test option is only valid for the minion, not the master	2017-01-12 09:13:46 +01:00
rallytime	efb8a8ddf5	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/configuration/minion.rst - salt/config/__init__.py - salt/minion.py	2016-12-22 10:39:14 -07:00
Erik Johnson	27253522c8	Improve pillar documentation (#38407) ... * rename anchor * Move pillar cache config option to different section, add an anchor * Add links to master and minion config items * Add documentation for pillar.item's "delimiter" argument * Improve pillar documentation This improves RST formatting, adding hyperlinks as well as adding information on the difference between in-minion pillar data and pillar data that is compiled on-demand. * Add section on how pillar environments are handled	2016-12-22 10:32:37 -07:00
Mike Place	68430b1fa6	Merge pull request #38348 from rallytime/mod-docs-2016.11 ... Update autodoc topics for new modules added in 2016.11	2016-12-20 13:36:20 -07:00
Dmitry Kuzmenko	dad748f57a	Data cache plugin configuration documentation.	2016-12-20 19:32:48 +03:00
rallytime	c6e191ad0d	Remove doc markup references from 2016.11 branch	2016-12-19 15:14:37 -07:00
rallytime	513058945c	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/states/requisites.rst - doc/topics/cloud/profitbricks.rst - doc/topics/cloud/vsphere.rst - doc/topics/releases/0.9.8.rst - doc/topics/releases/releasecandidate.rst - salt/cloud/clouds/vsphere.py - salt/minion.py - salt/states/archive.py - tests/unit/states/archive_test.py	2016-12-19 14:58:39 -07:00
rallytime	366271f459	Add snapper to state index doc module list	2016-12-19 10:32:44 -07:00
rallytime	135d254c80	Remove netapi autodoc files: they should not be added as their doc structure is different	2016-12-19 17:00:20 +00:00
rallytime	0006139aca	Update autodoc topics for new modules added in 2016.11	2016-12-19 16:44:34 +00:00
Mike Place	c83db5a785	Merge pull request #38320 from rallytime/cleanup-doc-refs ... Cleanup doc internal markup references	2016-12-18 05:31:27 -07:00
rallytime	5940db5b3f	Merge branch '2016.3' into '2016.11' ... No conflict.	2016-12-16 15:25:08 -07:00
Nicole Thomas	9e35f5dd08	Add azurearm module to doc index (#38322)	2016-12-16 14:44:20 -07:00
rallytime	23bce1c929	Remove ":doc:" references from all doc/topics/releases/* files	2016-12-15 16:45:51 -07:00
rallytime	4aafa41d22	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
rallytime	02bfe7912c	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
rallytime	6e32267d0c	Remove ":doc:" references in salt/* files	2016-12-15 14:03:56 -07:00
rallytime	4a62d01577	Add docs for syndic_wait setting ... Fixes #38174	2016-12-15 10:40:01 -07:00
Megan Wilhite	1a42e24e72	Fix beacon index (#38129) ... * add new beacon modules to index * add salt.beacons.avahi_announce to index and release notes	2016-12-07 10:44:53 -07:00
rallytime	8fd53a4808	Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/topics/cloud/vsphere.rst - salt/config/__init__.py - salt/daemons/masterapi.py - salt/templates/rh_ip/network.jinja - salt/utils/parsers.py - tests/unit/daemons_test.py	2016-12-02 12:18:18 -07:00
Ch3LL	e95f88fbe3	add docs for hash_type change to sha256	2016-12-02 09:28:50 -07:00
Nicole Thomas	6942d5d95b	Merge pull request #37995 from rallytime/merge-2016.3 ... [2016.3] Merge forward from 2015.8 to 2016.3	2016-11-30 13:12:55 -07:00
Mike Place	69a74a4d2d	Merge pull request #37950 from vutny/fix-starting-up-syndic ... Set default Salt Master address for a Syndic (like for a Minion)	2016-11-30 11:09:03 -07:00
rallytime	b44e17921c	Merge branch '2015.8' into '2016.3' ... No conflicts.	2016-11-30 09:21:45 -07:00
Denys Havrysh	7d9bc9abce	syndic_master: correct default value, documentation and example config	2016-11-30 17:18:44 +02:00
Erik Johnson	61ed9a8657	Add clarifying language to ext_pillar_first docs ... Also remove a sentence which may lead people to believe that they can make git_pillar and pillar_roots share top/sls files and be compiled together.	2016-11-29 15:49:05 -06:00
Erik Johnson	6135dfa4dd	Revert addition of pillar_roots_override_ext_pillar ... This turned out to be an unnecessary addition, as the root cause was ext_pillar_first not behaving as documented.	2016-11-29 15:35:04 -06:00
Erik Johnson	7f269bc7f9	Add clarification on expr_form usage and future deprecation (#37964)	2016-11-29 13:45:11 -07:00
Mike Place	ea46639ce7	Merge pull request #37272 from vutny/fix-getting-default-logging-opts ... Get default logging level and log file from default opts dict	2016-11-28 16:04:20 -07:00
rallytime	dfedd1185a	Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/grains/core.py - salt/modules/ddns.py - salt/templates/rh_ip/network.jinja	2016-11-28 11:08:19 -07:00
rallytime	523a67c422	Merge branch '2015.8' into '2016.3' ... Conflicts: - doc/conf.py - doc/topics/releases/version_numbers.rst	2016-11-28 10:52:52 -07:00
Erik Johnson	4cdc6cf5ec	Update earlier release channels' docs with Carbon release notes (#37914) ... * Update reference to Carbon in vsphere docs * Replace reference to Carbon in top file merging docs * Include Carbon version number * Replace references to Carbon with 2016.11.0	2016-11-28 10:33:31 -07:00
Benjamin Drung	9a51ba5c5b	Fix various spelling mistakes	2016-11-24 16:00:31 +01:00
Erik Johnson	7c1cfa82e4	Clarify the master_type docs (#37841) ... Mention when "disable" began to be supported.	2016-11-22 11:44:46 -07:00
Dmitry Kuzmenko	6857b9b8b1	Documented new TLS/SSL settings.	2016-11-21 17:21:54 +03:00
Denys Havrysh	83d6a44254	Add ssh_log_file option to master config and documentation	2016-11-20 16:13:55 +02:00
Denys Havrysh	c8a0915460	Fix configuration example and documentation for syndic_log_file option	2016-11-19 13:11:36 +02:00
rallytime	5ead1425d7	Merge branch '2016.3' into 'carbon' ... Conflicts: - doc/topics/releases/releasecandidate.rst - salt/modules/win_servermanager.py	2016-11-08 13:04:33 -07:00