Commit Graph

5517 Commits

Author SHA1 Message Date
Erik Johnson
854c7d9978 Remove old FAQ item referencing gitfs bug in 0.16.x
This release has been EOL for a long time, and is not even available
from pretty much any distro. It is safe to remove this item.
2016-01-11 16:45:56 -06:00
Justin Findlay
22c1129f02 modules.state.sls,highstate: mock versionadded 2016-01-11 14:29:00 -07:00
Justin Findlay
934de30939 add state mock to 2015.8.4 release notes 2016-01-11 14:24:51 -07:00
Justin Findlay
741f7aba31 add 2015.5.9 release notes 2016-01-08 16:08:03 -07:00
Jacob Hammons
2431c4c5c3 Updated man page and doc conf.py copyright year to 2016 2016-01-08 11:08:59 -07:00
Jacob Hammons
fe3da1c174 Updated man pages and doc version for 2015.5.9 2016-01-08 11:05:46 -07:00
Jorge Schrauwen
087e8f8475 Generate docs for salt.states.zfs 2016-01-08 17:24:44 +00:00
Duncan Mac-Vicar P
e7bbcb7988 Document schedule once option
closes #23742
2016-01-08 11:35:44 +01:00
Sergey Maranchuk
4cce4a7c32 fix salt-ssh debug doc
SALT_ARGV visible only in trace mode
2016-01-08 11:33:39 +02:00
Colton Myers
17b919e9ec Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/topics/eauth/access_control.rst
    salt/modules/state.py
    salt/state.py
    salt/states/boto_secgroup.py
    tests/unit/modules/state_test.py
2016-01-07 16:36:40 -07:00
Jacob Hammons
44ce704206 Updated zmq_monitor docs 2016-01-07 14:26:33 -07:00
Jacob Hammons
0d2111d397 Assorted doc bug fixes
Refs #4381
Refs #8146
Refs #13036
Refs #6853
Refs #9319
Refs #13777
Refs #2229
Refs #14946
Refs #15042
2016-01-07 14:08:30 -07:00
jacobhammons
5632ccb796 Merge pull request #30190 from jacobhammons/banners
Updated doc site banners
2016-01-06 15:37:33 -07:00
Jacob Hammons
51d28004da Updated doc site banners 2016-01-06 15:19:21 -07:00
Jacob Hammons
c3390955b0 Updated doc site banners 2016-01-06 15:18:11 -07:00
Jacob Hammons
266023baf1 Updated doc site banners 2016-01-06 15:16:26 -07:00
Colton Myers
f476c75fad Merge pull request #30062 from seanjnkns/develop
Remove recurse_list from pillar_source_merging_strategy and add pilla…
2016-01-06 10:27:35 -07:00
Sean Jenkins
8fc656b6f2 Set (pillar_)merge_lists to default for PR#30062 2016-01-06 09:55:20 -07:00
Colton Myers
7f8e666b8c Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/states/user.py
2016-01-06 09:30:28 -07:00
Colton Myers
8bc5506c08 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    doc/topics/installation/rhel.rst
    salt/modules/pacman.py
    salt/modules/pkgng.py
    salt/modules/win_update.py
    salt/states/boto_elb.py
    salt/states/file.py
2016-01-05 16:19:32 -07:00
Colton Myers
d73a7d6c4d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/ssh/index.rst
2016-01-05 16:11:20 -07:00
Stanislav Blokhin
d81f6f7206 Fix typo in gpgkey URL
Fixes following error on yum update:

Retrieving key from
https://repo.saltstack.com/yum/redhat/6/x86_64/latest/$releaseverSALTSTACK-GPG-KEY.pub

GPG key retrieval failed: [Errno 14] PYCURL ERROR 22 - "The requested
URL returned error: 404 Not Found"
2016-01-04 16:43:19 +01:00
Jered Sutton
01dbf385ef Adding random_master to reference and updating master_shuffle.
Adding master_shuffle to the minion example config file as it is needed for multi-master PKI.
2016-01-02 23:49:08 -06:00
Mike Place
040412b0b1 Merge pull request #30093 from zmalone/pillar-notes
Noting that file_roots and "state tree" should both be avoided
2015-12-30 15:40:05 -07:00
Zach Malone
cfbfd58afe Noting that file_roots and "state tree" should both be avoided, because in some
environments, the actual states show up another level down.  Adding notes about why this is undesirable.
2015-12-30 13:10:46 -07:00
Mike Place
8c29e2dd6a Document that gitfs needs recent libs
Closes #29921
2015-12-30 12:00:33 -07:00
Sean Jenkins
fb6e895bf0 Merge remote-tracking branch 'upstream/develop' into develop 2015-12-30 09:43:05 -07:00
Sean Jenkins
1d7ee7bed2 Merge remote-tracking branch 'origin/develop' into sean 2015-12-30 08:44:30 -07:00
Andrew Colin Kissa
61ca281519 fix inline documentation examples not rendering
add missing modules to indexes
2015-12-30 07:35:57 +02:00
rallytime
c386d70742 Merge branch '2015.8' into 'develop'
Conflicts:
  - salt/modules/alternatives.py
  - salt/modules/boto_rds.py
  - salt/modules/mount.py
  - salt/states/boto_iam.py
2015-12-29 15:51:12 -07:00
Mike Place
60431e342a Add documentation on debugging salt-ssh
Closes #27835
2015-12-29 15:22:03 -07:00
rallytime
6176f383e5 Spelling fixes 2015-12-29 11:57:18 -07:00
rallytime
83c05729d6 Add Syndic documentation to miscellaneous Salt Cloud config options
Fixes #30045
2015-12-29 11:53:49 -07:00
Sean Jenkins
41353b7ab3 Remove recurse_list from pillar_source_merging_strategy and add pillar_merge_list (bool) instead 2015-12-29 10:22:54 -07:00
Mike Place
e915f4b591 Merge pull request #30053 from akissa/add-postgres-privileges-support
Add postgres privileges support
2015-12-29 09:50:44 -07:00
Andrew Colin Kissa
8066a06191 add postgres_language state module documentation 2015-12-29 13:13:37 +02:00
Andrew Colin Kissa
d27f0cc88a add postgres_privileges ref docs 2015-12-29 13:02:56 +02:00
Jacob Hammons
a04cebd48c Remove internal APIs from rest_cherrypy docs.
Refs #28540
2015-12-28 15:26:16 -07:00
Jacob Hammons
32a352120a updated spm docs 2015-12-28 14:29:02 -07:00
Mike Place
9e385369b7 Merge pull request #30034 from rallytime/bp-29893
Back-port #29893 to 2015.8
2015-12-28 13:20:51 -07:00
Mike Place
d8e1663ef1 Merge pull request #30031 from deuscapturus/patch-6
Update index.rst
2015-12-28 12:39:17 -07:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
rallytime
a257249789 Add versionadded to SSH Port docs 2015-12-28 12:24:04 -07:00
abednarik
0bb83e51aa Updated Cloud msic section.
Added ssh_port section.
2015-12-28 12:11:16 -07:00
Nicole Thomas
548d887510 Merge pull request #30003 from marnovdm/develop
Adds thin provisioning support for new hard disks in VMware driver
2015-12-28 12:08:38 -07:00
Marno van der Molen
35bd10c5ba Implement suggestions from rallytime, tries to adhere to same documentation style and fixes optional thin_provision configuration 2015-12-28 19:28:07 +01:00
Theodore Cowan
aa80bd2700 Update index.rst
Inform user that state module runs will return "Failed to authenticate!" when the timeout is reached.  This should be fixed btw.
2015-12-28 10:47:40 -07:00
Thomas S Hatch
46471d83a7 Merge pull request #29999 from alprs/feature-require_without_state_type
[WIP] requisites without explicitly providing the state module
2015-12-28 10:30:10 -07:00
Marno
72a5f6b554 Update documentation for vmware driver 2015-12-24 18:48:19 +01:00
Andreas Lutro
03ceaf103b add documentation about omitting state modules in requisites 2015-12-24 13:07:44 +01:00
Seth House
7cc7a97b91 Clarified render step from worker pool step 2015-12-23 13:48:55 -07:00
Jonathan Ballet
e6e36372a4 doc: fix documentation link for salt.serializers 2015-12-23 10:13:16 +01:00
Seth House
75a95f5154 Add to Reactor docs to illustrate the end-goal and use with Orchestrate 2015-12-22 15:17:44 -07:00
Seth House
028f000743 Update opening Reactor paragraph for conciseness
We're far removed from 0.11 now so the extra exposition is just noise.
2015-12-22 13:38:33 -07:00
Jorge Schrauwen
1294a1fa5c probably a good idea to actually add salt.states.zpool 2015-12-22 19:16:18 +00:00
Jorge Schrauwen
da80dea902 try to get state.states.smartos docs go be generated 2015-12-22 19:11:46 +00:00
Jorge Schrauwen
f5333ee2f8 salt.modules.fmadm still does not have docs generated, trying again 2015-12-22 19:08:22 +00:00
Mike Place
c19782a184 Merge pull request #29853 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-12-22 08:05:49 -07:00
B M Corser
b89e9c6476 Presumably what was meant
Otherwise it's invalid syntax
2015-12-21 21:17:23 +00:00
Aditya Kulkarni
61a9293af9 Add info about VolumeType 2015-12-21 11:26:53 -05:00
Jonathan Ballet
5aa0e9b1e0 Fix documentation typo for pillars 2015-12-21 13:26:02 +01:00
Jonathan Ballet
f2b41d04d7 Fix rendering issues for Cherrypy netapi documentation. 2015-12-21 13:26:02 +01:00
Jonathan Ballet
6922da46dc doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
abednarik
b7e7bf5a29 Updated Cloud msic section.
Added ssh_port section.
2015-12-20 10:42:58 -03:00
Colton Myers
95fe811724 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/minion.py
    salt/modules/network.py
    salt/scripts.py
    salt/states/file.py
    salt/states/git.py
    salt/utils/event.py
2015-12-18 15:00:24 -07:00
Mike Place
7eefaac58a Merge pull request #29814 from basepi/multi-master.windows.29396
[2015.8][Windows] Fix multi-master on windows
2015-12-18 10:16:52 -07:00
Mike Place
fb4eb28645 Merge pull request #29819 from rallytime/esxi-docs
Add esxi module and state to docs build
2015-12-18 09:20:27 -07:00
Eric Mosher
0a765de370 Add infoblox documentation
Closes #29780
2015-12-17 23:01:55 -05:00
Thibault Cohen
d37064951d Add k8s modules and states documentation 2015-12-17 21:44:49 -05:00
rallytime
e7c5863468 Add esxi module and state to docs build
Also fixed some minor doc errors
2015-12-17 16:33:59 -07:00
Colton Myers
2405501d75 Add documentation for tcp ipc_mode and multi-master 2015-12-17 14:08:41 -07:00
Mike Place
4044f3bb93 Merge pull request #29803 from rallytime/vsphere-docs
Add vSphere module to doc ref module tree
2015-12-17 11:52:56 -07:00
Mike Place
5f2f128f64 Merge pull request #29804 from irtnog/fix-rhel-repo-config
Fix a typo in the gpgkey URL
2015-12-17 11:50:46 -07:00
rallytime
3b7f5540ec Add vSphere module to doc ref module tree 2015-12-17 10:54:28 -07:00
Mike Place
c4f226f31e Merge pull request #29773 from l2ol33rt/debian_install_docfix
Append missing wget in debian installation guide
2015-12-17 10:29:18 -07:00
Aditya Kulkarni
10bfcb8cb0 Add documentation about scopes (GCE) 2015-12-17 09:42:15 -07:00
Matthew X. Economou
f15a3648a4 Fix a typo in the gpgkey URL 2015-12-17 10:48:24 -05:00
Andrew Colin Kissa
b749b9faba Add Pillar SQLCipher module
Fixes #29781
2015-12-17 09:48:27 +02:00
Robert James Hernandez
64cb4b0540 Append missing wget in debian installation guide 2015-12-16 13:44:35 -08:00
Aditya Kulkarni
ae5fbe9046 Add documentation about scopes (GCE) 2015-12-16 15:21:51 -05:00
Mike Place
1f4810be0f Merge pull request #29729 from rallytime/fix-14634
Further clarifications on "unless" and "onlyif" requisites.
2015-12-16 07:45:06 -07:00
Simon A. Eugster
0ca82f27b8 Doc update on masterless mode: Move master config to minion config 2015-12-16 10:59:14 +01:00
rallytime
45b77fb288 Add note about shell truthiness vs python truthiness 2015-12-15 16:14:31 -07:00
rallytime
3bfb87c031 Spelling fixes 2015-12-15 15:45:19 -07:00
rallytime
15c466cc12 Further clarifications on "unless" and "onlyif" requisites.
Fixes #14634

- "unless" is actually a NAND operator
- remove usage of "opposite of unless" as that is confusing
2015-12-15 15:42:56 -07:00
rallytime
45080f3629 Add examples of using multiple matching levels to Pillar docs
Fixes #29091
2015-12-15 14:57:36 -07:00
jraby
296de21056 Document syslog facility format and default value 2015-12-15 14:56:13 -05:00
Mike Place
1c6e896edb Merge pull request #29655 from abednarik/disable_log_doc_update
Added a note regarding logging configuration.
2015-12-15 11:50:05 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
2015-12-14 15:56:26 -07:00
Colton Myers
b51cba59c0 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-14 15:44:21 -07:00
abednarik
bdf1824bd8 Added a note regarding logging configuration.
Simple example on how to turn off logging.
2015-12-14 17:26:40 -03:00
Mike Place
fe0778dad5 Merge pull request #29644 from rallytime/esxi-fixes
Fixed a couple more ESXi proxy minion bugs
2015-12-14 11:36:28 -07:00
abednarik
221c11f7da Updated documentation for Salt Development.
In order to install pip modules for salt development we need to make sure that python devel is installed.
Otherwise pip command will fail.
2015-12-14 13:57:51 -03:00
rallytime
577d5487a3 Fixed a couple more ESXi proxy minion bugs
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
2015-12-11 16:16:25 -07:00
Mike Place
9f83ab9cfc Merge pull request #29611 from cachedout/lint_29350
Lint 29350
2015-12-10 16:05:10 -07:00
Colton Myers
0afa5b0d5d Add cmd_umask to roster docs 2015-12-10 14:51:43 -07:00
Colton Myers
48311d42f7 Merge pull request #29384 from Granjow/watchRequisites
Add an example to the watch requisite.
2015-12-10 12:12:50 -07:00
Simon A. Eugster
d32bcc7d97 Documentation: Prefer cmd.run + onchanges over cmd.wait.
* Add information on how the watch requisite targetse other states
* Update examples in salt.states.cmd about cmd.run and cmd.wait
2015-12-10 08:12:09 +01:00
Simon A. Eugster
39e6bd7cc5 Requisite Documentation: Explain how to target other states 2015-12-10 08:05:42 +01:00
rallytime
5a2bb260d3 Added ESXi Proxy Minion Tutorial
Also added some more documentation to other ESXi-related files
and fixed some related doc errors.
2015-12-09 18:00:20 -07:00
Akhter Ali
88a55475a4 Merge branch 'develop' of github.com:saltstack/salt into Typo_correction 2015-12-09 17:03:31 -05:00
Akhter Ali
abe16e0b9f Fixing typo 2015-12-09 16:48:14 -05:00
Joe Healy
b96d8ff1d9 Minor update to release notes for missing fix
Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
2015-12-09 12:30:52 +01:00
Benjamin Drung
e72354aac4 Fix typo specfic -> specific 2015-12-09 12:19:39 +01:00
Benjamin Drung
5708355762 Fix typo comparsion -> comparison 2015-12-09 12:17:49 +01:00
Adrian Heine né Lang
b765bd46dc Update service manager info for Debian
Debian Jessie switched to `systemd` as default init system.
2015-12-09 08:49:02 +01:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
2015-12-08 14:46:23 -07:00
Mike Place
9bc9ca78de Merge pull request #29496 from terminalmage/remove-repoquery
Remove dependency on repoquery from yumpkg.py
2015-12-08 14:28:08 -07:00
Mike Place
25d3a75d8c Merge pull request #29540 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-12-08 14:27:01 -07:00
Mike Place
3ae096b7ac Merge pull request #29499 from rallytime/esxi-proxy
Initial commit of ESXi Proxy Minion
2015-12-08 14:10:13 -07:00
Mike Place
f77c8e7baf Merge pull request #29527 from jfindlay/2015.5
2015.5.7 notes: add note about not being released
2015-12-08 14:08:26 -07:00
Aditya Kulkarni
b3fdce7b75 Add docs 2015-12-08 15:58:38 -05:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
2015-12-08 12:23:26 -07:00
Simon A. Eugster
eb04e54b38 Compiler Ordering Docs: Use double backticks for highlighting inline code 2015-12-08 19:02:57 +01:00
Mike Place
de7f3d5a59 Merge pull request #29504 from rallytime/fix-12072
Document userdata_file option for EC2 driver
2015-12-08 09:54:33 -07:00
Justin Findlay
917e6f850c 2015.8.2 notes: add note about not being released 2015-12-08 09:16:26 -07:00
Justin Findlay
1a8044f0c9 2015.5.7 notes: add note about not being released 2015-12-08 09:12:36 -07:00
rallytime
90b4823bc2 Switch volumes and del_*_on_destroy example ordering
Refs #29101
2015-12-07 19:30:23 -07:00
rallytime
8357c95dc2 Document userdata_file option for EC2 driver
Fixes #12072
2015-12-07 16:52:10 -07:00
Erik Johnson
2461552a06 Hide aliased function 2015-12-07 15:20:51 -06:00
abednarik
8e5c3e366a Added Documentation note in salt cloud.
Added a Note for salt cloud settings since documentation shows those key in uppercase, but salt cloud expects thos in lowercase.
2015-12-06 13:42:18 -03:00
Jacob Hammons
c2dc709bce Added CVE-2015-8034 to 2015.8.3 and 2015.5.8 release notes 2015-12-03 20:14:16 -07:00
Jacob Hammons
4f51a737f9 Added CVE 2015-8034 to 2015.5.8 release notes 2015-12-03 20:02:16 -07:00
jacobhammons
ab890b632a Merge pull request #29417 from jacobhammons/repo-install-updates
Repo install updates
2015-12-03 19:39:41 -07:00
Jacob Hammons
d58182c5fa updated repo path for RHEL installation 2015-12-03 19:36:12 -07:00
twangboy
7bdddaca53 Fixed grammer 2015-12-03 11:18:32 -07:00
twangboy
d965d00a09 Fix #19332
Clarified precedence of pillar values
2015-12-03 11:15:46 -07:00
Jacob Hammons
5e54359869 Updated Debian, RHEL / Cent, Ubuntu installation instructions with new repo structure for 2015.8.3. Added CVE-2015-8034 to release notes. 2015-12-03 10:55:32 -07:00
Mike Place
7afd522878 Merge pull request #29339 from jacksontj/develop
Simplify TCP/IPC wire protocol
2015-12-03 09:58:41 -07:00
Jacob Hammons
ebf72924d2 updated version numbers in documentation 2015-12-03 09:21:48 -07:00
Jacob Hammons
486935b233 updated version numbers 2015-12-03 08:21:50 -07:00
Jacob Hammons
824721ff36 updated version numbers 2015-12-03 08:20:22 -07:00
Simon A. Eugster
5d76642197 Add an example to the watch requisite. 2015-12-03 09:14:15 +01:00
Thomas Jackson
8309b69740 Simplify TCP/IPC wire protocol
As I was working on another project, I ran into some other project doing exactly this. Our current wire protocol is effectively "len-of-thing thing", but msgpack already includes headers in the serialization--making it an iterably consumable format. This means we don't need to use/waste bytes on the wire for the len of the string (esp. since its currently a string serialization of how many bytes).

This change simplifies the wire protocol, but still maintains flexibility for changes later-- since we are effectively just msgpacking dicts across the wire.

Note: this is a backwards incompatible wire protocol change. This is only being done as TCP is considered "experimental". This will be the last and only change to the wire protocol in a backwards incompatible fashion-- as we are working towards first-class support for the next release.
2015-12-02 09:01:58 -08:00
Colton Myers
3f09d58fff Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/rh_ip.py
    salt/modules/s3.py
    salt/modules/saltutil.py
    salt/modules/zypper.py
    salt/spm/__init__.py
    salt/utils/aws.py
    salt/utils/s3.py
    tests/unit/modules/s3_test.py
    tests/unit/pydsl_test.py
2015-12-01 15:31:03 -07:00
Justin Findlay
08ced73b13 Merge pull request #29315 from jfindlay/docs
dev tutorial doc: fix markup errors
2015-12-01 14:42:17 -07:00
Colton Myers
0d90dd3a19 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    debian/salt-master.service
    salt/modules/win_pkg.py
2015-12-01 13:26:44 -07:00
Justin Findlay
e8e23dc444 dev tutorial doc: fix markup errors 2015-12-01 13:05:57 -07:00
Mike Place
7e424e10f2 Merge pull request #28054 from dr4Ke/custom_grains_deep_merge
loader uses a deep dictionary merge for the grains (core and customs)
2015-12-01 10:33:52 -07:00
Mike Place
7d276bdcd2 Merge pull request #29284 from cachedout/lint_29266
Add logentries engine
2015-11-30 14:48:32 -07:00
Mike Place
1efaab2dd5 Fix typo in #29279 2015-11-30 13:59:47 -07:00
Justin Findlay
a5ea39132f dev docs: add development tutorial 2015-11-30 13:11:13 -07:00
rallytime
9ba9019419 Initial commit of ESXi proxy work.
Update grains information to work properly

Added NTP functionality to vsphere module

Add ssh enable/disable capabilities

Allow list of host_names in ntp functions

Password update, ssh_restart, datetime management functionality added

Added enable/disable vsan and disk listing capabilities

Don't stack trace is VSAN System or VSAN Config are unset

Be able to provide a list of passwords via pillar to auth against a host

Fix bug with test.ping returning False, even though other functions work

Add ability to add blank host disks to host's vsan system

Minor bug fix for vsan_add_disks function
2015-11-30 12:42:36 -07:00
Mike Place
a6889cbdcb Merge pull request #29228 from s0undt3ch/develop
Fix the `engines_dirs` config option name.
2015-11-30 12:15:25 -07:00
Jimmy Tang
bdda03c456 Add logentries engine
This engine is first attempt at a simple engine to send event information
to the Logentries logging service.
2015-11-30 13:58:10 +00:00
Nitin Madhok
e30587d054 Updating docs for VMware cloud driver 2015-11-29 18:28:45 -05:00
Nitin Madhok
4fc2986b16 Updating docs for VMware cloud driver 2015-11-29 18:24:09 -05:00
Nitin Madhok
248c090af2 Updating/reorganizing docs for VMware cloud driver 2015-11-29 18:20:26 -05:00
Pedro Algarvio
d6d3d94b87 Fix the engines_dirs config option name. 2015-11-26 18:31:20 +00:00
Justin Findlay
9236188867 Merge pull request #29214 from cro/ssl_verify_ssl
Doc for salt.utils.http should say verify_ssl not ssl_verify.
2015-11-25 16:55:38 -07:00