Commit Graph

2253 Commits

Author SHA1 Message Date
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
Mircea Ulinic
66d99b520c Index netyang state 2017-04-01 19:06:35 +00:00
Mircea Ulinic
24cdabd3d4 Netyang autodoc 2017-04-01 18:07:08 +00:00
Mircea Ulinic
b878fe867a napalm_yang module autodoc 2017-04-01 02:48:02 +00:00
Mircea Ulinic
11f090fec9 Add napalm_syslog autodoc 2017-03-31 16:03:16 +00:00
Mike Place
b62c8c2965 Merge pull request #40414 from chaseadamsio/develop
docs: fix typo in states/index.rst
2017-03-30 15:00:38 -06:00
Lukas Raska
24cc9b2a0c [WIP] Refactor Elasticsearch execution and state modules (#40192)
* Add Ingest pipeline methods to Elasticsearch execution module

* Refactor Elasticsearch execution module and properly handle exceptions

* Throw CommandExecutionError in methods applicable for different Elasticsearch versions

* Refactor Elasticsearch states to reflect execution module changes

* Add state for managing Elasticsearch pipelines

* Fix few typos in Elasticsearch module, return None when deleted document doesn't exist

* Implements stats and health methods for Elasticsearch

* Add Elasticsearch methods to open/close index, manage search templates and repositories

* Merge existing Elasticsearch states into single one, add Search Template handling

* Add index alias state for Elasticsearch, fix documentation

* Catch all global exceptions in Elasticsearch states, unit test all of them

* Implement few Unit tests for Elasticsearch execution module, merge fixes into deprecated elastic states

* Implement additional unit tests for Elasticsearch execution module

* Finalize Elasticsearch module documentation
2017-03-30 13:22:58 -06:00
Chase Adams
f2d855bfbf docs: fix typo in states/index.rst 2017-03-30 04:41:04 -07:00
Chase Adams
b9982e3884 docs: fix typo in states/index.rst 2017-03-30 04:29:31 -07:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
2017-03-28 17:09:30 -06:00
Mike Place
d7e745a53a Merge pull request #40281 from terminalmage/rename-docker
Rename docker execution module to avoid shadowing in the loader
2017-03-28 11:06:08 -06:00
Erik Johnson
774a3f1147 Rename docker execution module to avoid shadowing in the loader
With the merging of #39996, salt/modules/docker.py now imports
salt.utils.docker. However, our loader appends the module dir (in
this case salt/modules/) to sys.path temporarily for the length of the
loading process. So, as the docker execution module tries to import
salt.utils.docker, when salt.utils.docker attempts to do an "import
docker", and docker-py is *not* installed, this results in
salt/modules/docker.py (the docker execution module) being loaded in its
place, which results in tracebacks in the minion log.

Renaming the docker execution module keeps this import shadowing from
occurring. Note that we don't need to do this for the placeholder
salt/states/docker.py as it does not import salt.utils.docker.
2017-03-28 10:50:47 -05:00
Nicole Thomas
d73a526fba Merge pull request #40309 from rallytime/redis-cache-docs
Move "redis" to "redis_cache" references in docs
2017-03-24 16:40:07 -06:00
rallytime
5363e0b58b Update minion data cache documentation
Updats the existing documentation and also adds more documentation
to the Multi-Master and Syndic topology files about the addition
of the pluggable minion data store.
2017-03-24 14:25:46 -06:00
rallytime
2a483a256a Move "redis" to "redis_cache" references in docs to allow redis_cache docs to build 2017-03-24 12:36:31 -06:00
David Boucha
61f2fa9339 Add documentation for the Minion data cache
Includes docs for localfs and consul minion data cache modules
2017-03-24 11:49:26 -06:00
Mircea Ulinic
09670fe9a0 Reference proxy options 2017-03-24 01:55:48 +00:00
Mike Place
e462a04d70 Merge pull request #40200 from DSRCorporation/features/zh864_auth_redesign
E-Auth refactoring
2017-03-23 13:32:20 -06:00
rallytime
235a768872 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
2017-03-22 17:44:08 -06:00
Dmitry Kuzmenko
b09d83b6d7 Allow to use different auth module for ACL. 2017-03-22 11:49:33 +03:00
Dmitry Kuzmenko
9309a83d21 Optionally keep auth list in token. 2017-03-22 11:49:33 +03:00
Erik Johnson
5ad476936d Overhaul Docker support
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
2017-03-21 16:53:19 -05:00
C. R. Oldham
bb71710747 Revert "Add special token to insert the minion id into the default_include path" 2017-03-21 13:41:03 -06:00
Mircea Ulinic
01c5c77305 Add proxy_always_alive option from #40178 2017-03-21 14:59:16 +00:00
Mircea Ulinic
186a6c4f2a Add proxy options doc 2017-03-21 14:59:16 +00:00
Mircea Ulinic
97343733ad Proxy config Examples 2017-03-21 14:59:16 +00:00
Mircea Ulinic
1ba599b784 Include proxy config instructions 2017-03-21 14:59:11 +00:00
Mircea Ulinic
c92b42d9af Add logmod doc 2017-03-16 14:00:39 +00:00
Mike Place
51fb191157 Merge pull request #39841 from rafaelcaricio/telegram-beacon
Telegram beacon
2017-03-14 13:30:37 -06:00
rallytime
9ddf032e8e Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/configuration/minion.rst
  - salt/beacons/status.py
  - salt/modules/saltutil.py
  - salt/utils/schedule.py
  - tests/integration/modules/test_beacons.py
  - tests/unit/beacons/inotify_beacon_test.py
2017-03-10 14:57:31 -07:00
Mike Place
935652cb24 Merge pull request #39923 from cloudflare/capirca-module
New execution module: Capirca
2017-03-10 12:25:29 -07:00
Mike Place
dc7d4f4224 Merge pull request #39935 from cro/namespace_proxy_cfg
Add special token to insert the minion id into the default_include path
2017-03-10 10:51:54 -07:00
Mike Place
eca9844cca Merge pull request #39926 from cloudflare/netacl-module
New execution module: netacl (napalm_acl)
2017-03-09 17:31:34 -07:00
Mike Place
27f1fffd33 Merge pull request #39927 from cloudflare/netacl-state
Netacl state
2017-03-09 17:29:26 -07:00
rallytime
c8b5d390b5 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/minion.py
2017-03-09 16:05:15 -07:00
C. R. Oldham
e4aef54c73 Add special token to insert the minion id into the default_include path 2017-03-09 15:31:16 -07:00
Jonathan Mickle
6b52e5a0b9 updating documentation for librato returner 2017-03-09 10:04:46 -08:00
Mircea Ulinic
fa7a6ff19b Add autodoc for netacl state 2017-03-09 17:09:27 +00:00
Mircea Ulinic
cf535d744e Add autodoc for netacl 2017-03-09 16:54:36 +00:00
Mircea Ulinic
d7dbc05caa Include Capirca autodoc 2017-03-09 16:34:20 +00:00
Rafael Caricio
88589fb1f6 Add documentation for the Telegram bot 2017-03-05 16:09:47 +01:00
Erik Johnson
7178e77eee Improve the Top File matching docs
In 2014.7.0, default matcher in the top file was changed to the compound
matcher, but the docs still suggest that it is the glob matcher. This
commit updates the docs to explicitly mention that the compound matcher
is now the default, and adds a table describing all of the available
matchers that can be set in the top file.
2017-03-03 10:40:22 -06:00
rallytime
65b239664e Restore ipv6 connectivity and "master: <ip>:<port>" support 2017-03-01 14:15:07 -07:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-02-28 12:50:10 -07:00
Erik Johnson
7b958fb389 Add options to skip fileserver/git_pillar preflight checks
This commit also modifies the master config for the test suite to use
this new option, so that a missing GitPython/Pygit2 will not crash the
test suite's master. This should make the test suite run smoother by
only negatively impacting those tests which require the pillar data
provided by git_pillar, when a valid provider is not available.
2017-02-27 20:21:53 -06:00
Mike Place
87642bc4ab Merge pull request #39691 from gtmanfred/develop
add syncing seperate cache modules on the salt master
2017-02-27 17:03:45 -07:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop'
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
2017-02-27 15:11:37 -07:00
Daniel Wallace
88e8a1b1c6 add syncing seperate cache modules on the salt master 2017-02-27 12:15:46 -06:00
Erik Johnson
cc2984e71a Add file-roots-directory-overlay anchor 2017-02-23 22:14:25 -06:00
Erik Johnson
0838331355 Add git_pillar_includes config option 2017-02-23 22:14:24 -06:00
Erik Johnson
862a3ec309 Different default value in example for pillarenv 2017-02-23 22:14:24 -06:00
Erik Johnson
2db0f2af4d Add versionadded for pillarenv_from_saltenv
I forgot to add this when initially implementing this feature.
2017-02-23 22:14:24 -06:00
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
Mike Place
75021cdb4c Merge pull request #39406 from thatch45/parallel_states
Parallel states
2017-02-19 10:58:35 -07:00
Erik Johnson
c673d06f48 Rename dockerng state/execution module to docker 2017-02-18 21:58:25 -06:00
Erik Johnson
6e24dd85c4 Remove dockerio state/module (moved to salt-contrib) 2017-02-18 21:58:24 -06:00
Mike Place
deba6d2655 Merge pull request #39367 from gtmanfred/develop
add extmod_blacklist to make it easier to remove modules
2017-02-17 16:57:44 -07:00
Mike Place
13b254aa7b Merge pull request #39363 from cloudflare/napalm_px
New execution module: napalm helpers
2017-02-17 16:55:10 -07:00
Thomas S Hatch
3a78c49b61 Fix some obvious oversights 2017-02-17 16:07:52 -07:00
Ionuț Ciocîrlan
ebe2c3e83b grammar in states/top.rst 2017-02-17 00:26:45 +02:00
Mircea Ulinic
30995955ce Include doc 2017-02-16 16:04:40 +00:00
Mircea Ulinic
ec5a43c9e6 Add doc for the new napalm execution module 2017-02-16 16:04:40 +00:00
Daniel Wallace
d332b33c8a add extmod_blacklist to make it easier to remove modules 2017-02-15 12:47:32 -06:00
Thomas S Hatch
aa6518cac7 Add docs 2017-02-14 13:51:55 -07:00
William Giokas
0647dc8aab doc: Fix the Nix documentation (#39343) 2017-02-13 09:42:37 -07:00
Mike Place
1d813bd902 Merge pull request #39283 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-02-09 15:10:03 -07:00
Mike Place
8dff26bd18 Merge pull request #39267 from KaiSforza/nix
Add nix module to Salt
2017-02-09 15:08:46 -07:00
William Giokas
5cb25025c9 Add nix module to Salt
This module adds the ability to work with nix packages, and do some
basic operations on the nix store. There is still some work to be done,
but this lets you orchestrate some basic tasks for a system with nix
installed.
2017-02-09 14:18:50 -06:00
Ivan Babrou
55965ce505
Autodetect IPv6 connectivity from minion to master 2017-02-09 11:33:21 -08:00
Mike Place
04161b001d Merge pull request #39248 from gtmanfred/develop
add runas as a global state variable
2017-02-09 10:36:15 -07:00
rallytime
609e6e4b23 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/modules/win_lgpo.py
  - salt/utils/aws.py
  - tests/unit/utils/schema_test.py
2017-02-09 10:29:40 -07:00
Mike Place
bac99d9e72 Merge pull request #39252 from gtmanfred/extmod_whitelist
Allow specifying which modules should be used when running saltutil.sync_*
2017-02-09 10:09:43 -07:00
Erik Johnson
d35c2f810c salt.utils.gitfs: remove dulwich support, make refspecs configurable (#39210)
* Add config params for custom refspecs

* Add exceptions for errors encountered modifying git config

* Make the refspecs a configurable parameter

* Make refspecs a per-remote parameter

* Update master config template to include custom refspecs opts

* Add documentation for new config params

* Update GitFS walkthrough with a section on custom refspecs

* Remove dulwich support from salt.utils.gitfs

Dulwich still lacks important features, including (but not limited to)
the following:

- Lack of the necessary support for checking out a ref needed for
  git_pillar/winrepo support

- No support in its config objects for multivar git config items, making
  it impossible to detect when repos have multiple refspecs set for a
  given git remote

Given this information, and the fact that it trails as a distant third
to Pygit2 and GitPython, Salt will cease to support Dulwich as a git
interface moving forward.

* Excise references to dulwich from documentation

* Add mention of custom refspecs to Nitrogen release notes

* Add gitfs_refspecs to mocked opts in gitfs integration tests

Also remove dulwich from unit tests

* Add information about opts argument not being intended for CLI use
2017-02-09 09:50:45 -07:00
Daniel Wallace
e6f243e4cd add note to clean_dynamic_modules 2017-02-08 14:50:04 -06:00
Daniel Wallace
b0b2b5482b add sync_sdb to salt-run saltutil 2017-02-08 14:43:40 -06:00
Daniel Wallace
413ae19592 document extmod_whitelist
for master and minion configs
2017-02-08 14:41:39 -06:00
Daniel Wallace
45d9a5f49c add documentation for the global runas state option 2017-02-08 14:01:38 -06:00
rallytime
2f74dcf685 Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
Mike Place
f8d79076f2 Merge pull request #39013 from terminalmage/zh878
Decryption of values in Pillar SLS files
2017-02-06 12:08:57 -07:00
Mike Place
46d8bfd026 Merge pull request #39034 from rallytime/doc-updates-develop
Update autodoc topics for new modules added in develop
2017-02-06 11:53:41 -07:00
rallytime
88cc195a2a Merge branch '2016.11' into 'develop'
No conflicts.
2017-02-03 10:58:55 -07:00
Jorge Schrauwen
387b10be25 zone state for Solaris 10/illumos (#39155)
* create zone state, zone.running, and zone.stopped

* renamed zone.running and zone.stopped, minor lint fixes

* cleanup message in zonecfg to make it clear for the zone state

* zone.property_present state

* zonecfg.set_property - should handle true/false parsed as boolean

* zonecfg module should be more consistant with message

* zone.property_absent implemented

* fix more minor issues in zonecfg when values get parsed as bool

* zonecfg fix spelling error

* improved zonecfg error message handling

* zonecfg parser should also do the reverse

* more improvements in zonecfg for parsing values

* small tweak to zonecfg simplyfy code for the zone state

* Add resource_present to zone state

* zonecfg lint fixes

* resource_absent state, lint fixed, test support

* zonecfg should be a bit more careful when removing the exported config

* zone.export state

* zone.import state

* zone.absent implemented

* zone.attached and zone.detached implemented

* very minor consistency fixes

* added zone.installed and zone.uninstalled, made zone.detached and zone.halted not fail on missing zone

* handle bool values in _parse_value

* add useful cleanup internal function to  zonecfg

* zonecfg - cleaned up _parse_value, added _sanitize_value and _dump_cfg for debugging

* zone.absent - uninstall would sometimes not do the right thing. some work on zone.present

* zone.present implemented path for when config does not yet exist

* zone.present supports updating properties

* zonecfg should support resources that do not have selectors

* zonecfg should also debug log remove_resource its config

* zone.present - implemented, after 2 refactors

* Finish documentation
2017-02-03 10:05:02 -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
Mike Place
56cb200cf8 Merge pull request #39027 from cloudflare/REDIS-CACHE
Redis cache plugin
2017-02-02 13:27:26 -07:00
rallytime
a6fdfcb4fa Fix some spelling errors and remove unecessary doc modules 2017-02-02 10:12:58 -07:00
rallytime
d398c5f7ee Update autodoc topics for new modules added in develop
Also adjusted versionadded tags as necessary on the files that
are getting new autodoc files added.
2017-02-02 10:12: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
eb61788f87 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
2017-02-01 16:36:45 -07:00
Mircea Ulinic
c051f7ae7b BGP runner doc 2017-02-01 18:17:19 +00: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
Erik Johnson
dec7cbf9c5 Add documentation on pillar decryption config items 2017-01-31 11:25:56 -06:00
Mircea Ulinic
570adea118 Redis cache doc 2017-01-30 16:24:04 +00:00
rallytime
8928436bdd Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/pillar/__init__.py
2017-01-30 09:06:27 -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
Mike Place
f9b2719ed3 Merge pull request #38942 from cloudflare/NET-RUNNER
New runner: net finder
2017-01-25 13:21:27 -07:00
rallytime
49f57ba3f1 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/utils/win_functions.py
2017-01-25 09:59:29 -07:00
Mircea Ulinic
317fb48ec7 net runner doc 2017-01-25 15:54:45 +00: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
Mike Place
5d126a2772 Merge pull request #38828 from eradman/pillarenv
Extend support for pillarenv_from_saltenv to master config
2017-01-20 12:15:02 -07:00
David Boucha
a643340632 Add documentation for the Minion data cache
Includes docs for localfs and consul minion data cache modules
2017-01-19 15:53:22 -07:00
Eric Radman
9b5d28df0c Extend support for pillarenv_from_saltenv to master config
`pillarenv_from_saltenv` is already an option for minion config, this
change enables this feature on the master.

If set to `true` salt will derive the pillar environment set on the
master:

$ salt-run pillar.show_pillar saltenv=radman
my_passphrase:
    XYZ

$ sudo salt-run pillar.show_pillar saltenv=radman2
my_passphrase:
    ABC
2017-01-19 13:34:33 -05:00
rallytime
5b43a252c9 Merge branch '2016.11' into 'develop'
Conflicts:
  - conf/master
  - doc/topics/installation/ubuntu.rst
  - salt/modules/pillar.py
  - salt/netapi/rest_tornado/saltnado.py
  - salt/states/influxdb_user.py
  - salt/utils/minions.py
  - salt/utils/openstack/nova.py
2017-01-17 09:50:06 -07: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
Mike Place
909bb15873 Merge pull request #38673 from kyrias/por_doc
ref/configuration/master: Document ping_on_rotate
2017-01-15 11:01:18 -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
Mircea Ulinic
5cf9c3e205
Statuspage state doc 2017-01-11 14:06:58 +00:00
Johannes Löthberg
2ac3da8d03 ref/configuration/master: Document ping_on_rotate
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
2017-01-10 23:01:06 +01: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