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
61,783 Commits 24 Branches 182 Tags 341 MiB
4f3596a69f
Commit Graph

1568 Commits

Author SHA1 Message Date
Thomas S Hatch
0d9e0c2b8c Merge pull request #24468 from jacobhammons/doc-fixes 
Bug fixes and build errors
 2015-06-08 09:25:40 -06:00
Alexander Schwartz
7d6b60c79d change "path" to "name" for "file" operations 
Path is no supported parameter for any file operation (maybe it has been in the past)
 2015-06-07 13:14:26 +02:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors 
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
 2015-06-05 17:32:35 -06:00
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
 2015-06-05 13:03:48 -06:00
Jacob Hammons
1f7a13d6f9 Salt cloud doc updates, build errors and bug fixes 
Refs #24309
 2015-06-04 16:42:47 -06:00
Arnold Bechtoldt
fc7f0724d3 add missing module documentation to references 2015-06-04 21:17:24 +02:00
Ryan Lane
a3924bba0e Add boto_kms docs 2015-06-03 15:18:52 -07:00
Thomas Jackson
2c6a5c7d1e Add comment attempting to explain the security shortcomings of salt-cp 
salt-cp definitely has its uses, but I want to call out the fact that it isn't designed as a secure file transfer mechanism.
 2015-06-02 18:26:04 -07:00
Aneesh Agrawal
82a4794e0f Do not reference serializers from aggregation docs. 2015-05-28 20:04:20 -04:00
Aneesh Agrawal
4b9311507c Add new module type for serializers from issue #22257. 
Move existing serializers from salt.utils.serializers to
salt.serializers.
 2015-05-28 20:03:11 -04:00
rallytime
d8daa9dcd7 Merge #24185 with a couple of fixes 
Refs #24185
 2015-05-27 15:25:27 -06:00
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -06:00
Drew Malone
fb0f1080dd Quick note on usability of 'include' statement. 2015-05-20 10:46:03 -04:00
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Nitin Madhok
12ea8f5c52 Fixing more sphinx/docs errors and warnings 2015-05-16 19:24:04 -04:00
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng 
Add docker-ng state module
 2015-05-15 12:09:58 -06:00
rallytime
580ed73840 Add a couple of grammar fixes to opts docs 2015-05-13 09:04:26 -06:00
Mike Place
1432077bd8 Add documentation about opts generation 2015-05-12 23:41:02 -06:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions 
- Allows you to set power settings on a windows minion for things like the monitor and disk
 2015-05-12 14:49:48 +02:00
Jacob Hammons
16d8a753ad saltstack2 sphinx theme and build settings 2015-05-11 17:29:12 -06:00
Forrest
552eb52c7b Add details to first line. 
We don't specify the top.sls in the first sentence which can be mildly confusing.
 2015-05-11 12:24:15 -07:00
Colton Myers
1bf2ff994e Merge pull request #23430 from basepi/merge-forward-develop 
Merge forward from 2015.5 to develop
 2015-05-08 16:46:21 -06:00
Thomas S Hatch
bfcee39e99 Merge pull request #23399 from mattrobenolt/expose-grains 
Add salt.loader.grain_funcs
 2015-05-08 08:37:30 -06:00
Colton Myers
ece63c36a3 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/modules/win_groupadd.py
 2015-05-06 15:49:50 -06:00
Colton Myers
ccf6690be8 Merge pull request #23398 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-05-06 15:42:44 -06:00
Colton Myers
1fb84450f4 Merge pull request #23396 from basepi/merge-forward-2015.2 
[2015.2] Merge forward from 2014.7 to 2015.2
 2015-05-06 15:42:35 -06:00
Erik Johnson
4fea5ba477 Add missing RST file 2015-05-06 12:06:49 -05:00
Erik Johnson
d395565bf7 Update Lithium docstrings in 2015.2 branch 2015-05-06 09:27:40 -05:00
Matt Robenolt
2e55f55c5d Add salt.loader.grain_funcs 
Exposes all of the functions that make up all of the grains. This
allows a user to call individual grain functions without collecting
all of them.
 2015-05-05 20:12:06 -07:00
David Boucha
10e0a2a0a2 clean up doc a bit 2015-05-05 17:14:57 -06:00
David Boucha
750bae117d add docs for the fire_event state feature 2015-05-05 17:14:57 -06:00
Colton Myers
2981aed48e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-05-05 16:49:31 -06:00
Colton Myers
fd09cdae6f Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/topics/ssh/roster.rst
    salt/client/ssh/__init__.py
    salt/client/ssh/wrapper/__init__.py
    salt/config.py
    salt/modules/file.py
    salt/runners/lxc.py
 2015-05-05 16:26:39 -06:00
Ryan Lane
f03c68655c Add missing pagerduty and boto docs 2015-05-04 23:31:26 -07:00
Colton Myers
cb69cd07de Match the master config template in the master config reference 2015-05-04 15:05:21 -06:00
Colton Myers
91dd9dcbdc Add ssh_minion_opts to master config ref 2015-05-04 15:00:28 -06:00
Steve Weber
97513b060a include module_dirs 
include module_dirs
 2015-05-04 13:00:31 -04:00
Thomas S Hatch
1a93deaf17 Merge pull request #23275 from terminalmage/issue5504 
Add pkg.group_installed state
 2015-05-02 18:41:39 -06:00
Seth House
d844ca5112 Removed docs for ext_pillar module that is a wip 2015-05-01 14:24:01 -06:00
Seth House
6be273d5f3 Removed stormpath_mod and linodepy docs; these were renamed 2015-05-01 14:24:00 -06:00
Seth House
cda915bcd4 Remove fsutils module documentation 
This module was moved to the utils folder in #17883.
 2015-05-01 14:13:59 -06:00
Erik Johnson
282ec1b8ec Exclude groupinstall alias from docs 2015-05-01 13:38:45 -05:00
Erik Johnson
23a827547c Add docker-ng state docs to toctree 2015-04-30 11:19:37 -05:00
Colton Myers
befb666623 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    salt/modules/mongodb.py
    salt/utils/http.py
    salt/utils/process.py
    tests/integration/__init__.py
 2015-04-27 10:28:53 -06:00
Colton Myers
a18e017619 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
    doc/man/salt.1
    doc/ref/cli/salt.rst
 2015-04-24 10:07:48 -06:00
Justin
8486e17ab3 Added retry_dns to minion doc. 2015-04-23 15:33:59 -06:00
Jonathan Ballet
19efd419b5 Improve state_output documentation 
List all the available settings in the documentation and on the command
line.
Also, make the documentation clearer about the different possibilities.
 2015-04-23 10:22:11 +02:00
Colton Myers
2210bd175e Merge pull request #22668 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-16 23:22:36 -06:00
Erik Johnson
e51a8e0e4a Add external anchor for "reloading modules" section of state docs 2015-04-16 20:17:25 -05:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
 2015-04-16 12:27:53 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Thomas S Hatch
b6e803910f Merge pull request #22753 from thatch45/doc_clear 
fix some bad sls data in a doc
 2015-04-16 11:58:17 -06:00
Thomas S Hatch
b20dbb822b fix some bad sls data in a doc 2015-04-16 11:49:35 -06:00
Colton Myers
8d9874a78a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-04-16 10:37:38 -06:00
Seth House
fe8f3e0bce Added generated doc for clustershell roster module 2015-04-15 18:34:27 -06:00
Seth House
767c328420 Remove docs for old nagios_json module 2015-04-15 17:52:06 -06:00
Michael Steed
70f1ca9ea5 Add missing command line options to man pages 
Refs #22676
 2015-04-14 17:32:56 -06:00
Michael Steed
5efb284c22 Update salt-call manpage to match cli help text 
refs #22239
 2015-04-14 11:52:55 -06:00
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
Thayne Harbaugh
6179839225 Improve documentation for nested nodegroup. 2015-04-09 01:43:18 -06:00
Thomas S Hatch
457ec179ae Add sudo user docs into salt 2015-04-08 14:41:05 -06:00
Corin Kochenower
911345dd1a Add versionadded label for event_return 2015-04-07 14:15:03 -06:00
Thomas S Hatch
9808332e8b Merge pull request #22417 from whiteinge/doc-sshclient 
Add SSHClient to the Python API docs
 2015-04-07 10:45:13 -06:00
Seth House
30ad8d99df Add SSHClient to the Python API docs 
I'm leaving cmd_sync out on purpose for now until we get eauth support
sorted.
 2015-04-07 09:53:02 -06:00
Thomas S Hatch
393ee4c87d Merge pull request #22390 from cro/pyshtrue_unless_onlyif 
Allow unless, onlyif, check_cmd to use python_shell=True
 2015-04-07 09:15:11 -06:00
C. R. Oldham
977d9accf0 Allow unless, onlyif, check_cmd to use python_shell=True 2015-04-06 14:20:08 -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
Seth House
fbfbde5bde Added autodoc placeholders for the new modules 2015-04-03 12:31:57 -06:00
Seth House
92e0338a59 Updated beacon, roster, runners module indexes with new additions 2015-04-03 12:27:11 -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
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Elias Probst
bc9a30b7e9 Typo (rendered → renderer) 2015-03-11 21:15:32 +01:00
Seth House
049975a1ca Added versionadded for ext_pillar_first 2015-03-11 11:53:59 -04:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
Thomas Jackson
b8e39c13f9 Add docs for new raw boolean support of depends decorator 2015-03-05 22:02:34 -08:00
Erik Johnson
ec2fe0d553 Add nspawn.remove function 
Also adds nspawn.destroy as an alias, for those who are used to managing
LXC containers.
 2015-03-03 14:38:53 -07:00
Erik Johnson
046a8fed7a Add compatibility function "remove" 
For people using a mix of LXC and nspawn containers
 2015-03-03 14:36:45 -07:00
Erik Johnson
ee570cf0a2 Add RST file for nspawn 2015-03-03 10:10:50 -07:00
Thomas S Hatch
3467622977 Merge pull request #21229 from thatch45/master_service 
Engines
 2015-03-03 09:35:48 -07:00
Seth House
714921a5dc Added autosummary placeholders for new models 2015-03-02 22:14:33 -07:00
Seth House
b6c1b2601f Added new modules to the module indexes 2015-03-02 22:13:42 -07:00
Seth House
1399949196 Merge remote-tracking branch 'upstream/2015.2' into develop 2015-03-02 14:19:37 -07:00
Seth House
57b1f67daa Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
Seth House
1382401618 Updated all the module index pages with the latest/newest modules 2015-03-02 13:59:19 -07:00
Seth House
b001cb6534 Added engine modules to modules index in docs 2015-03-02 13:49:17 -07:00
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
C. R. Oldham
00942f2060 Merge forward 2014.7->2015.2 2015-03-01 17:55:25 -07:00
Seth House
4d974d9676 Improved presence docs; added cross-references and localhost caveat 
Closes #18436.
 2015-02-28 19:22:38 -07:00
Erik Johnson
94d55889d7 Resolve merge conflicts 2015-02-28 12:35:25 -06:00
C. R. Oldham
c9610bc4f2 Merge commit, merge forward 2014.7 to 2015.2 2015-02-27 15:01:30 -07:00
Erik Johnson
4ce8a9d064 Improve salt fileserver documentation 2015-02-27 14:53:57 -07:00
Erik Johnson
a7ba699ad7 remove grains outputter from autosummary 2015-02-27 18:12:18 +01:00
Erik Johnson
abf00abea4 remove the docs' .rst file for deleted grains outputter 
See e1f8ea6.
 2015-02-27 18:12:18 +01:00
Ryan Lane
1bc840a3a9 Add missing boto docs 2015-02-25 12:50:44 -08:00
Erik Johnson
db85cd43f7 Improve salt fileserver documentation 2015-02-24 22:37:30 -06:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Alexander Pyatkin
c408c935a0 Implement Bower execution module 2015-02-21 05:56:20 +00:00
Colton Myers
f00465a8a1 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/event/index.rst
	salt/loader.py
	salt/modules/config.py
	salt/modules/cyg.py
	salt/modules/hg.py
	salt/modules/lxc.py
	salt/modules/upstart.py
	salt/states/hg.py
	salt/utils/cloud.py
	salt/utils/dictupdate.py
	salt/utils/schedule.py
	tests/integration/fileserver/gitfs_test.py
	tests/unit/pydsl_test.py
 2015-02-18 11:55:29 -07:00
dsumsky
6d797f50d4 - log_level_logfile and log_level configuration options inheritance docu updated 2015-02-12 19:47:59 +01:00
Erik Johnson
93835d3f4e Hide set_pass from lxc state docs 2015-02-10 15:06:46 -06:00
Arnold Bechtoldt
88dea95c6c add some cosmetic changes to the state requisites article 2015-02-07 18:46:03 +01:00
Amir Pakdel
eabb8a262c Added MS SQL execution module 2015-02-03 10:02:09 -05:00
rallytime
9898fcf613 Merge branch '2015.2' into 'develop' 
Conflicts:
	.gitignore
	.pylintrc
	.testing.pylintrc
	salt/client/mixins.py
	salt/cloud/clouds/msazure.py
	salt/config.py
	salt/modules/mount.py
	salt/runners/doc.py
	salt/utils/event.py
	salt/utils/reactor.py
 2015-01-29 17:24:04 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try 
Conflicts:
	salt/states/file.py
 2015-01-29 13:42:49 -07:00
Seth House
e3d29bf8ff Fixed syntax error in log_granular_levels example 2015-01-27 20:14:53 -07:00
Seth House
a26aef0d7d Added beacon module docs to the module index 2015-01-26 18:19:34 -07:00
Thomas S Hatch
bfc6ead3b0 Merge pull request #20039 from bechtoldt/doc_various_fixes 
completing some doc references
 2015-01-26 12:15:38 -07:00
Arnold Bechtoldt
439f253998 adding runners to doc salt.runners reference 2015-01-24 22:46:06 +01:00
Arnold Bechtoldt
4e72fdedb2 adding returners to doc salt.returners reference 2015-01-24 22:44:03 +01:00
Arnold Bechtoldt
2ad37d0bca adding renderers to doc salt.renderers reference 2015-01-24 22:41:54 +01:00
Arnold Bechtoldt
020ca989a3 adding output to doc salt.output reference 2015-01-24 22:38:28 +01:00
Arnold Bechtoldt
eeeff3b393 adding states to doc salt.states reference 2015-01-24 22:35:23 +01:00
Arnold Bechtoldt
7724073588 adding modules to doc salt.modules reference 2015-01-24 22:30:52 +01:00
Arnold Bechtoldt
73cbbf0e5f those files seem to be required, too 2015-01-24 21:51:45 +01:00
Arnold Bechtoldt
0ab5f51529 add missing file_tree and virtkey in pillar index doc, refs #19262 2015-01-24 21:43:32 +01:00
Thomas S Hatch
dca509eb0d Merge pull request #19859 from twellspring/develop 
Documentation fix for Issue 19513.
 2015-01-20 16:06:03 -07:00
twellspring
e62e36dd57 Update include.rst 2015-01-19 21:02:26 -08:00
Thomas S Hatch
1569520a4b Merge pull request #19792 from rallytime/merge_forward_develop 
Merge 2015.2 forward into develop
 2015-01-17 09:39:02 -07:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
rallytime
d724ed3a47 Merge branch '2015.2' into 'develop' 
Conflicts:
	salt/cli/batch.py
	salt/cloud/clouds/msazure.py
	tests/integration/netapi/rest_tornado/test_app.py
 2015-01-16 11:36:32 -07:00
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2 
Conflicts:
	salt/modules/archive.py
 2015-01-14 14:26:22 -06:00
rallytime
4a1a5123f2 Remove old --out options from salt-cloud docs 
Fixes #19453
 2015-01-13 21:39:27 -07:00
Mike Place
8284f0d6cc Some docs on runners 2015-01-13 16:26:59 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07:00
Thomas Jackson
f0aae727ce Comma cleanup 2014-12-12 11:39:07 -08:00
Thomas Jackson
85864eca4a Comma cleanup 2014-12-12 11:37:59 -08:00
Thomas Jackson
7da2bbc457 fix usage of e.g (no comma) 2014-12-12 11:37:48 -08:00
Thomas Jackson
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
da3ea213e9 Comma cleanup 2014-12-12 11:34:34 -08:00
Thomas Jackson
23674c100d Comma cleanup 2014-12-12 11:33:14 -08:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop 
More grammar/style cleanup
 2014-12-12 09:40:55 -07:00
Steve Groesz
e66a02b18b Update netapi reference 
Resolves issue #18760
 2014-12-11 18:14:47 -06:00
Metin OSMAN
d0799a864c Update documentation 2014-12-11 22:25:29 +01:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
68c0dc0717 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
9523435ee4 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
4df8db515c Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
e32a7e1ed7 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
9db7f8f7e9 Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
2afd4c8c04 Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
d12677156e Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
3859204103 Fix typo in renderers doc, the directory name was wrong 2014-12-10 18:42:16 -08:00
Nitin Madhok
c299f4119a Adding pillar to toctree 2014-12-08 10:52:38 -05:00
Nitin Madhok
f168af05ef Adding state to toctree 2014-12-08 10:50:09 -05:00
Nitin Madhok
67fd828708 Adding modules to toctree 2014-12-08 10:34:33 -05:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Thomas S Hatch
1bfed11756 Merge pull request #18541 from cachedout/event_return 
Event return
 2014-12-03 09:56:33 -07:00
Seth House
54d8760d2d Added docs for the state-level aggregate keyword 
Also added clarification on the two ways to invoke the aggregation
function.
 2014-12-02 18:33:10 -05:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00
Elias Probst
6a7662c498 Fix typo (agregate → aggregate). 2014-11-29 15:58:07 +01:00
Mike Place
8297c2c48e Documentation 2014-11-26 16:56:45 -07:00
Thomas S Hatch
2e3089410a Merge pull request #18514 from cachedout/issue_16879 
Update docs for unless
 2014-11-26 09:29:24 -07:00
Thomas S Hatch
6aa5b0f858 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/genesis.py
	salt/modules/parted.py
	salt/modules/win_service.py
	salt/runner.py
	salt/states/file.py
	tests/integration/netapi/rest_tornado/test_app.py
 2014-11-26 09:24:24 -07:00
Mike Place
988b8e621d Update docs for unless 
Note that unless is run for each associate state dec.
 2014-11-26 09:17:14 -07:00
rallytime
73f3c0091d Clean up doc build so it doesn't stacktrace 
Fixes #18471

- Add zmq.eventloop to mocked modules in doc/conf.py
- Cleaned up rst references in rest_tornado.rst
 2014-11-25 15:11:15 -07:00
Nitin Madhok
93700aa642 Fixing sphinx errors and violations 2014-11-25 15:01:30 -05:00
Konrad Starzyk
0759323c99 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-25 11:52:27 +01:00
Colton Myers
754baafcf7 Merge branch '2014.7' into develop 2014-11-24 14:38:46 -07:00
Colton Myers
42223567b8 Add warning to docs about topfile compilation 
Ref #12483
 2014-11-24 14:33:37 -07:00
Konrad Starzyk
99406c2215 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7 Documentation fixes for jboss7 and artifactory states/modules 2014-11-20 11:16:57 +01:00
pengyao
3ffa0dfc6b Url should be '/keys' 2014-11-20 11:16:58 +08:00
Colton Myers
716a7e3331 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/modules/bsd_shadow.py
	salt/modules/freebsdjail.py
	salt/modules/yumpkg.py
	salt/modules/zfs.py
	salt/modules/zypper.py
	salt/netapi/rest_tornado/saltnado.py
	salt/states/dockerio.py
 2014-11-18 12:46:29 -07:00
Nitin Madhok
5d8ae4e32f Fixing sphinx violations and errors 2014-11-18 02:53:40 -05:00
Colton Myers
b2a2facb27 Add one additional folder and clarification to client_acl docs 2014-11-17 14:55:08 -07:00
Thomas Jackson
6d2fbc8715 Documentation for saltnado 2014-11-13 08:36:29 -08:00
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08:00
Thomas S Hatch
b3d2edc9a5 Merge branch '2014.7' into develop 2014-11-04 15:11:23 -07:00
Colton Myers
df0547969f We evaluate a prereq, we don't call it. Fixes #17086 2014-11-04 11:36:30 -07:00
Henrik Holmboe
1f3ba9ced5 Add possible values to arguments in Salt man-page 2014-11-03 21:27:14 +01:00
Henrik Holmboe
d3da8549a2 Typo jod -> job 2014-11-03 21:26:28 +01:00
Henrik Holmboe
878a227837 Choose vs chose typo 2014-11-03 20:54:39 +01:00
Seth House
aff7ab3f43 Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-29 16:47:23 -05:00
Seth House
9da07584e4 Added missing docs for the /key rest_cherrypy entry point 
Should have been part of #16706.
 2014-10-29 16:35:04 -05:00
vs
7d84f116e3 fix formatting 2014-10-29 14:37:18 +01:00
vs
4beb56bdbb add wheel.minions to wheel-index 2014-10-29 14:35:13 +01:00
vs
9e63712488 add documentation for wheel.minions 2014-10-29 14:18:23 +01:00
Colton Myers
945e6506b6 Merge branch '2014.7' into develop 2014-10-27 15:32:25 -06:00
Colton Myers
6da0967805 Fix pre-required vs pre-requiring mixups in prereq doc 2014-10-27 10:59:07 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
vs
692252f41b Merge branch 'sreq_cache_option' into optional_sreq_caching 2014-10-23 15:55:26 +02:00
Thomas S Hatch
cb14a8660e fix docs for mod_aggregate per #16575 2014-10-21 16:37:34 -06:00
Thomas S Hatch
3cf0cfb61d Merge branch '2014.7' into develop 2014-10-20 09:20:37 -06:00
Erik Johnson
13a92bde69 Add further clarification that gitfs auth is pygit2-only 2014-10-19 17:01:13 -05:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop 
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
 2014-10-19 18:21:19 +01:00
vs
2e1d3b07b8 add cache_sreqs option to minion documentation 2014-10-16 07:33:37 +02:00
Erik Johnson
49c7e6ac1a Fix misspelled code-block type 2014-10-15 22:44:27 -05:00
Erik Johnson
bb6de490ef Grammar correction 2014-10-15 22:36:12 -05:00
Mike Place
d0e90c77a6 Typo fix 2014-10-14 13:18:54 -06:00
Mike Place
0fcc0b5ae7 Document pillar ovewrite strategy 2014-10-14 13:07:26 -06:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Joseph Hall
130e0842c8 Merge pull request #16566 from terminalmage/docs 
Minor wording fix in highstate docs
 2014-10-11 06:34:39 -06:00
Erik Johnson
af64f17fe4 Minor wording fix in highstate docs 
This fixes some grammar weirdness.
 2014-10-10 22:25:55 -05:00
rallytime
54b7abdb17 Fix conf_minion references 2014-10-10 09:19:27 -06:00
Nicole Thomas
2901e9439b Merge pull request #16514 from cachedout/master_doc_fix 
Small doc fixes
 2014-10-09 15:07:17 -06:00
Mike Place
11ef20fdf5 Small doc fixes 2014-10-09 10:14:37 -06:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
rallytime
6d1c14b1be Add recon_* config options to minion docs 
Fixes #16471
 2014-10-08 14:11:34 -06:00
Colton Myers
000b391f2f State Module, not State Declaration 2014-10-07 19:25:44 -06:00
Thomas S Hatch
d4eaf2323e Merge pull request #16339 from cachedout/module_fail_reasons 
Module failure reporting
 2014-10-07 10:21:37 -06:00
Jens Rantil
53153277ce Fix incorrect client ACL documentation 
Tested this by setting up a local Vagrant instance using the following
procedure:
 1. Made a fresh minion/master install (using salt-bootstrap) of version
    2014.1.10.
 2. Adding a `test.ping` ACL rule for the `vagrant` user.
 3. Asserting that I couldn't execute `salt '*' test.ping'` as `vagrant`
    user.
 4. Applying `chmod 755 /var/cache/salt /var/cache/salt/master/jobs
    /var/run/salt /var/run/salt/master`.
 5. Verifying that `salt '*' test.ping'` now works.

Fixes #16318.
 2014-10-05 10:40:37 +02:00
Mike Place
2abc93afe6 Merge branch 'develop' into module_fail_reasons 2014-10-03 13:08:39 -06:00
Mike Place
a5e1540f22 Provide a facility for modules to report the reasons they cannot be 
loaded.
 2014-10-02 15:43:10 -06:00