Commit Graph

1302 Commits

Author SHA1 Message Date
Nitin Madhok
39f31b1ab0 Adding salt.engines.sqs_events.rst to doc 2015-04-13 12:20:42 -04:00
Nitin Madhok
87e70a7d3a Adding salt.engines.logstash.rst to doc 2015-04-13 12:20:09 -04:00
Thomas S Hatch
457ec179ae Add sudo user docs into salt 2015-04-08 14:41:05 -06:00
Mike Place
a19340de40 Merge pull request #22355 from whiteinge/caller-cmd
Added a `cmd` method to the Caller() class for consistency with *Clients
2015-04-06 11:26:11 -06:00
Seth House
786c598f06 Added a cmd method to the Caller() class for consistency with *Clients
This adds a new method to the Caller() class which is intended for use
from the Python API. The existing CLI behavior is untouched.

Whether to use `Caller().function()` or `Caller().sminion.functions`
causes the occasional confusion. Also using `function` parses args and
kwargs in a way intended for use from the CLI (I think) which can cause
unexpected behavior at the Python level.
2015-04-03 20:26:59 -06:00
Mike Place
3bc74501e4 Document many core opts
Although these are documented in other places, we need somewhere that we
can store more in-depth, interface-specific information about various options.

This way, we can make implementation-specific comments which would not be approrpiate
for user configuration files.
2015-04-03 17:17:06 -06:00
Seth House
4cb33c92d6 Added autodoc generated pages for the new modules types 2015-04-03 12:45:49 -06:00
Seth House
ef3893d4de Updated module index pages for each of the module types 2015-04-03 12:39:13 -06:00
jfindlay
d9369b1be7 Merge pull request #22262 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-04-02 08:36:06 -06:00
Joseph Hall
ba3f6bc32c Merge pull request #22258 from nmadhok/vmware-cloud-driver
Creating vmware cloud driver
2015-04-02 07:31:50 -06:00
Colton Myers
0b7ac988cc Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    .pylintrc
    salt/beacons/service.py
    salt/beacons/sh.py
    salt/modules/cassandra_cql.py
    salt/returners/cassandra_cql_return.py
2015-04-01 14:22:33 -06:00
Thomas S Hatch
d2e4ac840d Merge pull request #22212 from ckochenower/2015.2
Add detail for writing a returner
2015-03-31 15:15:52 -06:00
Corin Kochenower
f44e25715a Add detail for writing a returner 2015-03-31 13:59:11 -06:00
Nitin Madhok
bfa4ef77e2 Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Clint Armstrong
51b32b860b remove x509 runner docs 2015-03-31 11:31:49 -04:00
Clint Armstrong
2fd9cf70be Merge branch 'develop' into x509 2015-03-31 11:29:46 -04:00
Nicole Thomas
44c7eb4d4b Merge pull request #22169 from basepi/merge-forward-develop
Merge forward from 2015.2 to develop
2015-03-31 09:21:36 -06:00
Colton Myers
124ad51c40 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
    doc/ref/index.rst
    doc/topics/eauth/index.rst
    salt/beacons/__init__.py
    salt/beacons/service.py
    salt/loader.py
    salt/minion.py
    salt/output/nested.py
2015-03-30 15:10:17 -06:00
John Syrinek
663b19e5b7 Improves example illustrating SLS-to-Python mapping 2015-03-30 14:04:05 -05:00
Nitin Madhok
3143a54817 Excluding get_configured_provider() and script() from sphinx 2015-03-30 14:22:23 -04:00
Mike Place
27465e0f0f Merge pull request #22129 from terminalmage/docker-ng
Add docker-ng module
2015-03-30 10:37:45 -06:00
Mike Place
adb8d5c718 Merge pull request #22054 from jfindlay/log_color
convert custom LogRecord attribute formatting from {}- to %-style
2015-03-30 10:37:18 -06:00
Nitin Madhok
031a78b86d Adding script function to this driver and adding this driver to clouds docs 2015-03-29 23:32:34 -04:00
Elias Probst
c00c14f2be Initial documentation improvements for pillar.pillar_ldap 2015-03-30 01:58:54 +02:00
Erik Johnson
2e823b84e8 Add docker-ng module 2015-03-29 12:32:07 -05:00
Erik Johnson
f7e6523461 Add dockerng execution module docs to toctree 2015-03-29 12:32:07 -05:00
Erik Johnson
6846d3e01b Update the exclude-members for lxc module 2015-03-29 12:32:07 -05:00
Erik Johnson
d9f0273680 Update the exclude-members for nspawn module 2015-03-29 12:32:07 -05:00
Justin Findlay
294dfe2d94 clarify and expand console log colors help 2015-03-26 23:21:30 -06:00
Nitin Madhok
71c73d3d62 Adding salt.cloud.clouds.vmware to docs 2015-03-26 19:45:14 -04:00
Seth House
fa3d1c3ad4 Added runner module for working with sdb
This is literally a copy of the execution module.
2015-03-26 18:34:53 -04:00
Clint Armstrong
59eea7dfd6 added runner docs 2015-03-26 13:24:58 -04:00
Clint Armstrong
12fa6950fc added state docs 2015-03-26 13:24:07 -04:00
Clint Armstrong
b17eb94168 added state docs 2015-03-26 13:24:03 -04:00
Clint Armstrong
aab3d37314 added module to doc index 2015-03-26 13:22:26 -04:00
Seth House
8e203c4a0a Added the etcd sdb module to the module index 2015-03-26 11:52:21 -04:00
Nicole Thomas
e7c7608ae2 Merge pull request #22018 from whiteinge/doc-sdb-modules-index
Add sdb modules to the module index
2015-03-25 16:36:50 -06:00
Seth House
264c08841e Added generated .rst files for the various sdb modules 2015-03-25 17:11:20 -04:00
Seth House
c2af83ea3e Added sdb modules to the module index 2015-03-25 17:08:19 -04:00
Colton Myers
7ba2404cc9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    conf/master
    conf/minion
    doc/ref/configuration/master.rst
    salt/loader.py
    salt/minion.py
    salt/modules/ssh.py
    salt/output/nested.py
    salt/utils/network.py
2015-03-25 09:28:04 -06:00
rallytime
73a0df18a8 There are 4 values, not 3. 2015-03-24 14:57:29 -06:00
rallytime
c98118eb55 Update pillar_source_merging_strategy config doc spacing
to match accross all config values
2015-03-24 14:56:09 -06:00
John Syrinek
6558d9e6d7 Fix unless example
The second `unless` example failed to compile
2015-03-24 14:02:27 -05:00
Godefroid Chapelle
ffe267a741 Specify valid values for gitfs_provider option 2015-03-23 15:33:10 +01:00
Arnold Bechtoldt
db38f80945 update references, fixes #21879 2015-03-22 10:16:41 +01:00
Colton Myers
fd93491a5f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	salt/cloud/clouds/linodepy.py
	salt/master.py
	salt/modules/boto_route53.py
	salt/modules/virt.py
	salt/renderers/gpg.py
	salt/runners/doc.py
	salt/runners/jobs.py
	salt/runners/manage.py
	salt/runners/virt.py
	salt/utils/event.py
	salt/utils/http.py
2015-03-16 15:12:02 -06:00
Thomas S Hatch
cc9d294fcd Merge pull request #21569 from basepi/merge-forward-2015.2
Merge forward from 2014.7 to 2015.2
2015-03-12 13:36:39 -06:00
rallytime
0171f68600 Use the full version for a versionadded tag 2015-03-11 16:29:08 -06:00
Colton Myers
fec632ae18 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
Conflicts:
	salt/utils/cloud.py
2015-03-11 15:18:00 -06:00