valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
81,995 Commits 24 Branches 182 Tags 341 MiB
c3a49c9552
Commit Graph

2204 Commits

Author SHA1 Message Date
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
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
Erik Johnson
f7acb34248 Deprecate expr_form argument in the LocalClient 
The published commands and the events all use tgt_type, expr_form is
only used in the LocalClient, which has been confusing to many users.
This puts expr_form on a deprecation path, allowing it to continue to be
supported while tgt_type becomes the new official argument name.
 2016-11-29 14:03:34 -06:00
Mike Place
856407ee27 Merge pull request #37951 from gtmanfred/develop 
retry states didn't make it into carbon
 2016-11-29 09:51:21 -07:00
rallytime
4760455600 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/grains/core.py
  - salt/modules/dockerng.py
  - tests/unit/modules/linux_acl_test.py
 2016-11-29 09:31:05 -07:00
Daniel Wallace
6658c2f12b retry states didn't make it into carbon 
Update the version to Nitrogen
 2016-11-29 10:09:47 -06: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
Mike Place
44306dd8a5 Merge pull request #37913 from gtmanfred/develop 
Add ircbot engine for sending events to the reactor
 2016-11-28 13:38:11 -07:00
Daniel Wallace
4d9722fb45 Add ircbot engine for sending events to the reactor 
More to be added later like triggering commands from irc.
 2016-11-28 13:12:42 -06: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
rallytime
b3340c3a73 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/conf.py
  - salt/config/__init__.py
  - salt/minion.py
 2016-11-28 10:40:47 -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
Eric Radman
3f2e13d1fc Remove repeated words in docs (#37871) 
Found using

find . -name '*.rst' | xargs igor -R -r
 2016-11-23 14:53:17 -07: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
rallytime
ce384b5009 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/config/__init__.py
 2016-11-21 17:30:59 -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
Super-User
65ad8cc599 zonecfg scafolding 2016-11-19 14:51:55 +01:00
Denys Havrysh
c8a0915460 Fix configuration example and documentation for syndic_log_file option 2016-11-19 13:11:36 +02:00
Daniel Wallace
7b946e5fb9 add option required for metadata server grains 2016-11-17 10:12:43 -06:00
Mircea Ulinic
07c66f3ff8
Table outputter doc 2016-11-15 16:29:30 +00:00
Mike Place
b049ad6ead Merge pull request #37658 from sjorge/develop-zoneadm 
Want a zoneadm module
 2016-11-12 20:32:05 +00:00
rallytime
7b2341bbfd Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/topics/releases/releasecandidate.rst
  - salt/modules/file.py
  - salt/states/file.py
  - salt/utils/network.py
 2016-11-10 15:59:51 -07: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
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543) 
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
 2016-11-08 09:42:12 -07:00
Super-User
2684319213 introduce zoneadm module, implements list 2016-11-05 13:19:36 +01:00
Mike Place
d86ec7372f Merge pull request #37374 from cloudflare/NAPALM-USERS-MODULE 
New execution module: napalm_users
 2016-11-04 18:00:46 +13:00
Mircea Ulinic
8e087c9596
napalm_users doc 2016-11-03 11:23:41 +00:00
Mircea Ulinic
0590c9142f
Doc for exec mod napalm_users 2016-11-03 10:35:37 +00:00
Mike Place
107fd322a6 Merge pull request #37373 from cloudflare/NAPALM-SNMP-STATE 
Napalm snmp state
 2016-11-03 12:13:33 +13:00
Mircea Ulinic
877ed8f1d5
Small typos 2016-11-02 12:01:19 +00:00
Mircea Ulinic
78cf63d0ef
Doc for the napalm snmp mod 2016-11-02 12:01:15 +00:00
Mircea Ulinic
13086c580b
Doc for napalm_route 2016-11-01 14:56:23 +00:00
Mircea Ulinic
626790f7da
Include doc 2016-11-01 13:40:59 +00:00
Benedikt Werner
b641d75235 Added suse_apache and sensehat to doc index and fixed doc formating 2016-10-30 20:41:37 +01:00
rallytime
8d3957f250 Merge branch 'carbon' into 'develop' 
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/boto_ec2.py
  - salt/modules/cmdmod.py
  - salt/modules/win_lgpo.py
 2016-10-28 11:58:41 -06:00
rallytime
c722a18468 Update Carbon versionadded tags to 2016.11.0 in doc/* 2016-10-27 15:26:30 -06:00
Mircea Ulinic
0ba8a2e5b9
Add NAPALM grains to docs 2016-10-27 15:50:46 +00:00
Mike Place
4d603894d0 Merge pull request #37164 from sjorge/pdbedit 
module and state for pdbedit
 2016-10-24 12:03:48 +09:00
Super-User
5c943ddeae generate docs for pdbedit state 2016-10-22 10:14:30 +00:00
rallytime
db3150b3f1 Merge branch 'carbon' into 'develop' 
Conflicts:
  - doc/topics/installation/windows.rst
 2016-10-21 15:19:16 -06:00
Super-User
052f069cab enable doc generation for pdbedit 2016-10-21 18:27:36 +00:00
rallytime
a7dda5706e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/cmdmod.py
  - salt/modules/win_service.py
  - salt/modules/x509.py
  - salt/utils/__init__.py
  - tests/unit/modules/win_service_test.py
 2016-10-19 18:20:04 -06:00
Justin Findlay
478def4923 doc.ref.configuration.minion: add proxy vars 2016-10-18 10:50:37 -06:00
rallytime
6d0cedcadd Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-17 09:06:12 -06:00
Daniel Wallace
2a4c9ac4f3 document master_type disable (#37014) 2016-10-14 12:24:12 -06:00
Thomas S Hatch
8e714dbaba Merge pull request #36982 from gtmanfred/webhook 
[RFC] add webhook engine
 2016-10-14 10:16:52 -06:00
Daniel Wallace
daf474a6eb add webhook engine 2016-10-14 11:08:05 -05:00
rallytime
0a5b1f5466 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-13 09:58:18 -06:00
rallytime
1d3aaf8097 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-10-12 15:26:27 -06:00
rallytime
5362e5183e Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/ref/cli/index.rst
 2016-10-12 12:36:00 -06:00
Mate Ory
d2f8f18430 doc: document what the argument of salt --subset means 2016-10-12 10:42:31 -06:00
Őry, Máté
7d9fdfd0fe doc: document what the argument of salt --subset means (#36943) 2016-10-12 09:46:31 -06:00
Jacob Hammons
dd21da4992 Add autodoc topics for new modules added in Carbon (#36933) 
Module formatting issues
Add list of new Carbon modules to release notes
 2016-10-12 09:31:07 -06:00
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-11 17:22:12 -06:00
Nicole Thomas
7838d8d3f9 Remove "Targeting with Executions" section from docs (#36925) 
This feature was removed long ago and is no longer under development.

Fixes #36906
 2016-10-11 16:33:56 -06:00
Erik Johnson
a56bf8bd2d Update references to future default value change that was reverted (#36924) 2016-10-11 16:33:41 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
Jorge Schrauwen
8b9648cd97 [develop] salt.modules.at was hopelessly broken on Solaris-like platforms (#36873) 
* disable current at module on solaris, only compute job_kw_regtex once

* provide at_solaris (virtual=at) for Solaris-like systems

* add proper maintainer header

* forgot to update the docs again

* add notice that at module only works on linux, openbsd, and freebsd

* salt.states.at needed a lot of love

* update at_state checks to pass valid date to at.at, at.jobcheck, at.atrm,...

* today I learn about mod_watch, and I want it for at
 2016-10-11 10:33:40 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - doc/topics/beacons/index.rst
 2016-10-10 10:19:50 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-10 10:18:02 -06:00
Jorge Schrauwen
0b304e75a3 missing docs for salt.modules.apcups (#36863) 2016-10-08 19:51:45 -06:00
Jorge Schrauwen
ee9eb7c413 rbac_solaris should be included in the docs (#36859) 
* rbac_solaris - want module docs

* rbac_solaris - want state docs
 2016-10-08 07:54:26 -06:00
rallytime
f73bdf55c2 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/ini_manage.py
  - salt/states/glance.py
 2016-10-07 09:51:21 -06:00
Justin Findlay
cc071b75cb doc.glossary: add idempotent 2016-10-06 16:17:22 -06:00
Mike Place
53f1523cb8 Merge pull request #36790 from cachedout/pr-36727 
Merge forward carbon to develop
 2016-10-05 23:57:23 +09:00
Mike Place
aa7bfb422c Merge pull request #36578 from lomeroe/add_states_retry_option 
add global 'retry' option to state processing
 2016-10-05 22:47:57 +09:00
Mike Place
4bdb997dae Merge pull request #36785 from cachedout/pr-36728 
Fixup merge forward #36728
 2016-10-05 20:02:16 +09:00
rallytime
24b8bba145 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-30 16:13:08 -06:00
rallytime
5d7b4e4511 Merge branch 'carbon' into 'develop' 
Conflicts:
  - conf/master
  - doc/ref/configuration/logging/index.rst
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
  - salt/modules/gpg.py
 2016-09-30 16:10:33 -06:00
Yoram Hekma
3bb2cb6379 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy 2016-09-30 15:59:21 -06:00
rallytime
555ae9aa9b Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-30 10:13:39 -06:00
Erik Johnson
3d15eedfe0 Add additional information about onchanges/onchanges_in 2016-09-29 23:02:39 -05:00
Justin Findlay
4dd4fc94dc log levels doc: try long form table 
sphinx didn't render the shorthand table
 2016-09-29 10:11:06 -06:00
rallytime
112903ad7e Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
  - doc/ref/configuration/master.rst
  - salt/cli/daemons.py
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/modules/archive.py
  - salt/modules/cmdmod.py
  - tests/unit/states/service_test.py
 2016-09-29 09:56:43 -06:00
Mike Place
7e0a1cdab8 Merge pull request #36293 from isbm/isbm-thin-modules-config 
Configure thin/min modules permanently
 2016-09-29 11:28:56 +09:00
Ethan Moore
8eeebf8112 add retry documentation to global states/requisites page 2016-09-28 19:07:27 +00:00
rallytime
da574e5b03 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/runners/thin.py
 2016-09-28 09:01:24 -06:00
Mike Place
13f3aa31da Merge pull request #36628 from yhekma/develop 
Update doc to reflect the version where 'none' was added as a pillar_…
 2016-09-28 22:36:29 +09:00
Bo Maryniuk
419819e92a Add documentation about thin-min configuration 2016-09-28 12:22:32 +02:00
Pavel Chechetin
6b917bb0b6 Fix 'if if' pattern in docs and comments 2016-09-28 13:12:44 +03:00
Yoram Hekma
308d542742 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy 2016-09-28 07:23:53 +02:00
rallytime
07921cc3c6 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-27 08:39:48 -06:00
Bo Maryniuk
a441b35588 Add documentation about Salt Thin configuration 2016-09-27 11:12:07 +02:00
David Boucha
9d3ad82ae5 Merge pull request #36222 from damon-atkins/update_to_35899_win_pkg 
Update to PR 35899 win_pkg
 2016-09-26 21:01:30 -06:00
Erik Johnson
58dd0d5cdc Cleanup for #36222 (#1) 
Updates to  salt/states/pkg.py, modules/win_pkg.py, doc/ref/configuration/minion.rst
 2016-09-27 11:36:42 +10:00
Mike Place
4956d7d5a3
Merge branch '2016.3' into 2016_3_develop 2016-09-26 21:47:32 +09:00
Michal Kuffa
cc81f74bc6 Fix rst table syntax in logging docs section 
Signed-off-by: Michal Kuffa <michal.kuffa@gmail.com>
 2016-09-25 15:05:59 +02:00
rallytime
d5bbd91c14 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - conf/master
 2016-09-23 17:01:17 -06:00
Nicole Thomas
5548ed771d Back-port #36435 to 2016.3 (#36532) 
* Added "none" option for pillar_source_merging_strategy

* added none to merging strategy in dictupdate so we no longer log warnings when it is selected

* Updated documentation

* fix for when pillar_source_merging_strategy is not set

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry

* Let's not break when no merging strategy is passed

* Capitalisation

* Update on doc
 2016-09-23 13:36:23 -06:00
rallytime
d0ec4ead2a Merge branch '2016.3' into 'carbon' 
No conflicts.
 2016-09-23 08:32:17 -06:00
Erik Johnson
cc9d41fb0e Change items in minionfs blacklist/whitelist example 
These were copypasta'ed from gitfs' blacklist/whitelist example, but
they aren't as apropos here because the blacklist/whitelist for minionfs
is meant to refer to minion IDs, not branches/tags like in gitfs.
 2016-09-22 18:22:03 -05:00
Yoram Hekma
ded8ad43ec Update on doc 2016-09-22 08:35:50 +02:00
Yoram Hekma
1f354783e7 Capitalisation 2016-09-21 17:34:09 +02:00
Yoram Hekma
6becc0d1e7 Updated documentation 2016-09-20 11:05:17 +02:00
Erik Johnson
37c48472d6 Add documentation for fileserver_list_cache_time 2016-09-12 16:29:09 -05:00
Mike Place
2e76f73ea1 Merge pull request #35918 from rallytime/fix-18614 
Remove the compact outputter
 2016-09-02 00:49:43 +09:00
C. R. Oldham
908234d9ab Document module whitelisting. Remove FIXME comments for disable_modules and disable_returners as they are definitely implemented. (#35717) 2016-09-01 09:40:36 -06:00
rallytime
eed0a9d23d Remove the compact outputter 
This outputter was originally introduced in the 2014.7 branch, but
quickly regressed and never worked in a released version of Salt. Since
then, its existence has caused much confusion. In addition, this
outputter actually was supposed to accomplish the same thing as setting
"state_verbose" to False. Therefore, it doesn't make sense to maintain
two outputters (this one and the highstate outputter).

Fixes #18614
 2016-08-30 14:16:59 -06:00
rallytime
bd157b8dbe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/cloud.py
 2016-08-30 12:03:06 -06:00
Mike Place
f7d8f408c2 Merge pull request #35822 from terminalmage/issue35045 
Fixes for top file merging
 2016-08-31 01:40:41 +09:00
rallytime
9e55bee5d5 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-30 10:17:53 -06:00
Loren Gordon
08e10f69eb Clarifies how to create aliased functions (#35891) 2016-08-30 10:04:58 -06:00
Erik Johnson
f2f4482fa0 Update top file merging docs to reflect new strategy 2016-08-30 08:58:18 -05:00
rallytime
4ebfde9337 Remove node refernce in execution module docs: doesn't exist. 2016-08-29 15:33:26 -06:00
rallytime
2320865e5c Remove references to logstash_http engine: should be http_logstash. 2016-08-29 14:59:06 -06:00
rallytime
82e9cb748f Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/mixins.py
  - salt/engines/sqs_events.py
  - salt/minion.py
 2016-08-29 12:48:43 -06:00
Nicole Thomas
96792663da Add engines to list of extension module options in master config docs (#35864) 
Fixes #35837
 2016-08-29 12:22:30 -06:00
rallytime
5f93d682aa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
 2016-08-29 10:56:11 -06:00
Erik Johnson
c534d88280 More clarification/correction in minion docs 2016-08-27 15:18:06 -05:00
Erik Johnson
e9e6ea8485 One more tweak to top file merging docs 
This catches one more inaccuracy that wasn't fixed in
https://github.com/saltstack/salt/pull/35774
 2016-08-27 14:30:14 -05:00
rallytime
2b1ad9e9b9 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/utils/gitfs.py
 2016-08-26 14:54:54 -06:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
 2016-08-26 13:21:12 -06:00
Nicole Thomas
0ee237a9cb Remove extra "to" in top.rst docs (#35808) 
Refs #35774
 2016-08-26 10:38:57 -06:00
Alexander Bauer
e4dfc21581 Trivial documentation spelling fix (#35800) 
Change `statnds` to `stands` in State Writing documentation.
 2016-08-26 10:30:08 -06:00
Erik Johnson
2fc61763d8 Correct the top_file_merging_strategy documentation (#35774) 
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.

These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
 2016-08-26 10:25:56 -06:00
rallytime
6464236f68 Merge branch '2016.3' into 'develop' 
Conflicts:
  - doc/conf.py
  - doc/ref/returners/index.rst
  - salt/states/disk.py
 2016-08-25 16:09:01 -06:00
Nicole Thomas
6784cb036d Implement suggestions of bytes vs str type for #35593 (#35783) 
* Implement suggestions of bytes vs str type for #35593

Refs #35593

* Str, not bytes
 2016-08-25 15:45:51 -06:00
Mike Place
89bf5cf250 Developer documentation for Unicode handling (#35593) 
* Developer documentation for Unicode handling

* Clarifications
 2016-08-25 15:30:31 -06:00
Nicole Thomas
cd90052187 Documentation spelling fixes (#35773) 
Fixes #35771
 2016-08-25 13:41:03 -06:00
rallytime
b80ef26cf2 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cli/batch.py
  - salt/minion.py
  - salt/modules/cassandra_cql.py
  - salt/modules/rsync.py
 2016-08-23 10:44:55 -06:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-08-22 09:29:13 -06:00
Brian Glogower
2801f0fdcc Remove duplicate auth_tries in minion docs 2016-08-19 17:46:26 -07:00
Nicole Thomas
f7f8221169 Everything in the sample master config file should be commented out (#35611) 2016-08-19 16:05:40 -06:00
Mike Place
69b44bc6f8 Merge pull request #35500 from rallytime/fix-35068 
Add docs for pillar_raise_on_missing option
 2016-08-17 18:15:29 +09:00
rallytime
cface344d6 Add docs for pillar_raise_on_missing option 
Fixes #35068
 2016-08-16 14:57:58 -06:00
Mike Place
e3858d8f80 Merge pull request #35400 from thatch45/snapper_states 
Introduce rollback to Salt States
 2016-08-16 12:04:39 +09:00
Mike Place
c7564d997a Merge pull request #35464 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-16 10:26:54 +09:00
Thomas S Hatch
4cc2add938 Add soem more notes to the salt-cp doc 2016-08-15 15:59:41 -06:00
rallytime
48cc3bdfaa Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/modules/dockerng_test.py
 2016-08-15 13:27:52 -06:00
rallytime
6a86a12294 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-08-15 11:23:44 -06:00
Mike Place
09925ba353 Minor doc fixup (#35436) 
* Minor doc fixup

Refs #35387

* Include reload_grains
 2016-08-15 09:53:56 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
Thomas S Hatch
63a4a36454 Add config docs 2016-08-11 15:52:44 -06:00
Justin Findlay
66332510c6 doc.ref.configuration.logging: document log levels 2016-08-10 14:10:43 -06:00
Justin Findlay
93616eff3e doc.ref.configuration.logging: fix formatting 2016-08-10 10:47:07 -06:00
Justin Findlay
472a2d31de doc.ref.configuration.logging: cleanup formatting 2016-08-10 10:46:39 -06:00
rallytime
de4b33f2e1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/client/ssh/shell.py
  - salt/config/__init__.py
  - salt/grains/core.py
  - salt/utils/gitfs.py
 2016-08-08 12:34:23 -06:00
rallytime
9216e8ad93 Remove deprecated vsphere cloud driver in Carbon release 
This driver has been marked for deprecation and removal in Carbon.
Release notes were updated accordingly.

Users will need to use the vmware cloud driver instead.
 2016-08-05 16:16:12 -06:00
Nathan Gould
3683f9a715 Improve clarity of requisite docs 
Docs should stick to the terms "required" vs. "dependent", where required means the state that has to happen first, and dependent means the state that relies on the required state.
 2016-08-04 15:14:39 -04:00