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
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