Commit Graph

2044 Commits

Author SHA1 Message Date
Mircea Ulinic
5cf9c3e205
Statuspage state doc 2017-01-11 14:06:58 +00:00
Mircea Ulinic
515c6643c9
StatusPage module doc 2017-01-05 18:02:13 +00:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
2016-12-22 12:15:06 -07: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
d10e3ece5a Merge pull request #38404 from terminalmage/pillarenv
Add config option to pin pillarenv to effective saltenv
2016-12-22 09:34:19 -07:00
Erik Johnson
1fd9c716d9 Add pillarenv_from_saltenv minion config parameter 2016-12-21 19:49:32 -06:00
Mike Place
4d05dc5337 Merge pull request #38396 from gtmanfred/develop
add travisci module
2016-12-21 14:01:37 -07:00
Daniel Wallace
05574d4770 add travisci module
Used to verify webhook post requests came from travis
2016-12-21 12:42:09 -06: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
rallytime
494a06bee2 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-12-20 10:03:44 -07:00
Dmitry Kuzmenko
dad748f57a Data cache plugin configuration documentation. 2016-12-20 19:32:48 +03:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist
Remove support for client_acl and client_acl_blacklist
2016-12-20 06:33:23 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
2016-12-19 16:18:48 -07: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
8f80916432 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
2016-12-19 14:00:52 -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
Mike Place
e937fa44e1 Merge pull request #38315 from sjorge/develop-zonecfg
zonecfg module for Solaris 10 and compatible
2016-12-16 12:08:00 -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
Andreas Tsaridas
bbadac329c add doc for master config (#38189)
* add doc for master config

* changes requested
2016-12-09 17:23:06 -07:00
Mike Place
31180a4733 Merge pull request #38119 from sypets/documentation-requisites-overview-table
documentation: added overview (table) of requisites to requisites doc
2016-12-09 11:51:36 -07:00
Sybille Peters
9e53ddd3a9 added info for prereq, changed heading text and formatting 2016-12-08 09:53:57 +01:00
rallytime
4998b8d116 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/peer.rst
  - doc/topics/reactor/index.rst
2016-12-07 16:31:11 -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
Sybille Peters
94bd10ec12 changes for more clarity 2016-12-07 16:41:42 +01:00
Sybille Peters
1964fcf638 documentation: added overview (table) of requisites to requisites doc 2016-12-07 10:57:02 +01:00
rallytime
9b2bbe77ef Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/archive.py
  - salt/netapi/rest_tornado/saltnado.py
2016-12-06 10:03:10 -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
Mircea Ulinic
3375e5fe30
netconfig state doc 2016-12-02 13:27:44 +00:00
Mike Place
03e0fd39d1 Merge pull request #37963 from terminalmage/tgt_type
Deprecate expr_form argument in the LocalClient
2016-12-02 02:45:16 -07:00
rallytime
0eab0ee8a6 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/topics/releases/2016.11.0.rst
2016-12-01 12:14:33 -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
Nicole Thomas
2723188c6f Merge pull request #37956 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2016-11-29 13:52:38 -07:00
Erik Johnson
7f269bc7f9 Add clarification on expr_form usage and future deprecation (#37964) 2016-11-29 13:45:11 -07:00