valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,610 Commits 24 Branches 182 Tags 341 MiB
d29218e043
Commit Graph

667 Commits

Author SHA1 Message Date
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply 
Resolves #32037.
 2016-03-21 22:56:17 -05:00
Nicole Thomas
f267b7b6ac Merge pull request #31998 from jacobhammons/mock-imports 
Fixed build errors, additional mock imports, new module docs
 2016-03-19 09:48:06 -06:00
Jacob Hammons
e48b84c98f Fixed build errors, additional mock imports, new module docs 
Fixes #31975
 2016-03-18 17:37:22 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
 2016-03-18 16:00:35 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06:00
rallytime
1a1ce05186 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - .testing.pylintrc
  - salt/cloud/clouds/joyent.py
 2016-03-15 12:34:57 -06:00
Jacob Hammons
fd7f7bcddf Updated release notes 
Added a shortcut to link to pull requests
Added doc entries for all new modules
removed the unnecessary :undoc-members: option from recent doc module entries
 2016-03-14 16:34:22 -06:00
Seth House
cb72b19240 Fix outdated Jinja 'env' variable reference 2016-03-10 19:48:42 -07:00
rallytime
2ee175c6d3 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/fileclient.py
  - salt/modules/glusterfs.py
 2016-03-02 13:48:11 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
 2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
rallytime
40cd0ac8fe Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/states/file.py
  - tests/runtests.py
 2016-02-25 16:21:15 -07:00
rallytime
3b74d123af Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/selinux.py
  - salt/modules/zypper.py
  - salt/pillar/__init__.py
  - salt/states/dockerng.py
  - tests/runtests.py
 2016-02-25 12:36:22 -07:00
Jacob Hammons
a72dc15720 Assorted doc issues 
Fixes #10330
Fixes #31216
Fixes #30464
Fixes #29520
Fixes #30261
Fixes #29636
Fixes #29528
 2016-02-24 16:56:52 -07:00
Kyle Stapp
87f4843490 Clarified the form of requisite targets/requisite-references 2016-02-24 10:34:03 -05:00
rallytime
8e3fd82718 Document onfail requisite bugfix behavior change 
Refs #22370 and #31235
 2016-02-16 10:44:42 -07:00
Colton Myers
076b49a4ca Merge remote-tracking branch 'upstream/2015.8' into merge-forward-2016.3 
Conflicts:
    README.rst
    doc/conf.py
    doc/ref/index.rst
    doc/ref/proxy/all/salt.proxy.ssh_sample.rst
    doc/topics/installation/rhel.rst
    doc/topics/releases/2015.8.4.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/cloud/clouds/opennebula.py
    salt/config/__init__.py
    salt/modules/boto_dynamodb.py
    salt/modules/boto_ec2.py
    salt/modules/boto_elasticache.py
    salt/modules/boto_elb.py
    salt/modules/boto_iam.py
    salt/modules/boto_rds.py
    salt/modules/boto_sns.py
    salt/modules/boto_sqs.py
    salt/modules/dracr.py
    salt/modules/git.py
    salt/modules/mine.py
    salt/modules/systemd.py
    salt/modules/win_pkg.py
    salt/modules/yumpkg.py
    salt/pillar/__init__.py
    salt/states/git.py
    salt/states/rabbitmq_vhost.py
    salt/states/saltmod.py
    salt/utils/pkg/rpm.py
    setup.py
    tests/unit/modules/systemd_test.py
    tests/unit/states/rabbitmq_vhost_test.py
 2016-02-11 22:33:49 -07:00
rallytime
742d0a6b04 Change all relevant Boron references to 2016.3.0 
And more Boron deprecation warnings to Carbon
 2016-02-10 15:45:28 -07:00
rallytime
33eb6ba125 Remove overstate docs and a few references. 
The overstate system was deprecated and removed in Beryllium, in
favor of orchestrate.
 2016-02-08 09:28:32 -07:00
Jacob Hammons
b192a9ba38 Doc restructuring, organization, and cleanup. Updated the doc navigation. 2016-01-31 20:10:02 -07:00
rallytime
4fa80f2d5e Merge branch '2015.8' into 'develop' 
Conflicts:
  - doc/ref/states/all/index.rst
  - salt/cloud/__init__.py
  - salt/minion.py
  - salt/modules/file.py
  - salt/modules/guestfs.py
  - salt/modules/ipmi.py
  - salt/modules/osquery.py
  - salt/modules/parted.py
  - salt/modules/seed.py
  - salt/modules/virt.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/states/boto_elb.py
  - salt/states/pkg.py
 2016-01-26 16:19:39 -07:00
rallytime
57b7e6cc93 Add glance state to list of state modules 
Fixes #30621
 2016-01-25 12:35:19 -07:00
Andrew Colin Kissa
806823315e Add postgres_initdb state module documentation 2016-01-22 12:21:03 +02:00
Jacob Hammons
2b7f96bf0e Fixed sphinx build warnings / errors, added autodoc entries for new modules added in Boron 2016-01-19 21:57:45 -07:00
Mike Place
1f5c1093fc Merge pull request #30235 from sjorge/state-zfs 
salt.states.zfs
 2016-01-12 12:39:13 -07:00
Jorge Schrauwen
087e8f8475 Generate docs for salt.states.zfs 2016-01-08 17:24:44 +00: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
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
Andrew Colin Kissa
61ca281519 fix inline documentation examples not rendering 
add missing modules to indexes
 2015-12-30 07:35:57 +02: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
Andreas Lutro
03ceaf103b add documentation about omitting state modules in requisites 2015-12-24 13:07:44 +01: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
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
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
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
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
Simon A. Eugster
eb04e54b38 Compiler Ordering Docs: Use double backticks for highlighting inline code 2015-12-08 19:02:57 +01:00
Simon A. Eugster
5d76642197 Add an example to the watch requisite. 2015-12-03 09:14:15 +01:00
Jacob Hammons
b344ebfe4a doc for salt.states.smartos 2015-11-18 17:21:57 -07:00
rallytime
cded9ac01d Merge branch '2015.8' into 'develop' 
Conflicts:
- salt/cloud/clouds/vmware.py
- salt/modules/freebsdpkg.py
- salt/modules/virtualenv_mod.py
- salt/states/boto_asg.py
- tests/integration/__init__.py
- tests/runtests.py
 2015-11-06 09:34:31 -07:00
rallytime
eec9d69387 Merge branch '2015.5' into '2015.8' 
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/file.py
	tests/integration/__init__.py
 2015-11-04 15:52:59 -07:00
rallytime
be8f650901 Punctuation. 2015-11-02 19:30:58 -06:00
rallytime
fd846822c1 Add state_auto_order defaults to True note to ordering docs 
Fixes #28243
 2015-11-02 19:29:32 -06:00
Colton Myers
b3f3275e0a Merge pull request #28163 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-10-21 16:46:40 -06:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Thayne Harbaugh
7f8d5a56d1 Improve documentation of check_cmd. 
* Make the distinction between requisite `check_cmd` and `file.managed`
  `check_cmd`.

* Be more clear about `file.managed` `check_cmd`, the temporary file,
  and when the new contents are written or discarded.

* In requisite `check_cmd` use a concise `!` rather than the awkward
  `&& exit 1 || exit 0`.

* A few minor, stylistic changes.
 2015-10-20 13:44:06 -06:00
C. R. Oldham
3712066fc9 More docs. 2015-10-19 13:19:20 -06:00
C. R. Oldham
4ce2f8bb11 Documentation. 2015-10-16 16:52:14 -06:00
Richard Hansen
9aa19575fa new ldap state module 2015-10-09 17:47:56 -04:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Daniel Hahler
98a8c0f055 doc: minor fixes to doc and comments 2015-10-02 01:18:32 +02:00
Jonathan Ballet
97e69ebb97 doc: fix state's top documentation typo 2015-09-25 12:16:48 -06:00
jacobhammons
24e665335d Merge pull request #27399 from multani/fix/docs 
Various documentation fixes
 2015-09-25 09:42:52 -06:00
Jonathan Ballet
c4e7392a2b doc: fix state's top documentation typo 2015-09-25 10:36:27 +02:00
Colton Myers
ec6cd80496 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/ref/auth/all/index.rst
    doc/ref/auth/all/salt.auth.rest.rst
    doc/ref/beacons/all/index.rst
    doc/ref/beacons/all/salt.beacons.ps.rst
    doc/ref/pillar/all/index.rst
    doc/ref/pillar/all/salt.pillar.consul_pillar.rst
    doc/ref/pillar/all/salt.pillar.neutron.rst
    doc/ref/pillar/all/salt.pillar.sql_base.rst
    doc/ref/pillar/all/salt.pillar.sqlite3.rst
    doc/ref/sdb/all/salt.sdb.rest.rst
    salt/modules/rh_ip.py
    salt/utils/http.py
 2015-09-22 15:31:46 -06:00
Arnold Bechtoldt
3a7d31a91c add missing module references 2015-09-20 13:22:32 +02:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors 
Added missing modules to contents
 2015-09-17 09:23:24 -06:00
Justin Findlay
0d62d3470c Merge pull request #27111 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-15 01:29:30 -06:00
Jacob Hammons
d939a38c8c release notes updates 2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Jacob Hammons
ac3bd47440 states/pkgrepo examples, suse installation updates 
Refs #26644
Refs #26638
 2015-09-02 11:37:40 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
 2015-09-01 15:35:21 -06:00
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
 2015-09-01 15:15:13 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key 
#24510
 2015-08-31 20:00:30 -06:00
Jacob Hammons
45c1ff3543 Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates. 
Refs #21214
 2015-08-31 13:51:31 -06:00
Colton Myers
76c70162db Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    doc/topics/spm/index.rst
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/opennebula.py
    salt/cloud/clouds/openstack.py
    tests/unit/states/file_test.py
 2015-08-26 14:47:33 -06:00
Justin Findlay
1d404bd561 remove trailing whitespace in state top docs 2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2 change md code quoting to rst in state top docs 2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6 add default_top description to docs 2015-08-26 01:44:33 -06:00
Colton Myers
75f48b4a96 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/targeting/grains.rst
 2015-08-21 16:48:48 -06:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Erik Johnson
56fc78de80 Hide aliased funcs from docs 2015-08-17 17:29:13 -05:00
Seth House
4471c3f237 Add note about top-file only env assignment and the show_top() function 2015-08-11 11:29:33 -06:00
Seth House
5864111429 Minor spelling, style fixes 2015-08-11 11:29:25 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -06:00
Mike Place
889b4d2795 Merge pull request #24878 from cachedout/issue_12483 
Top file enhancements
 2015-08-11 11:24:46 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Thomas S Hatch
0e705d2185 add pchanges docs 2015-08-08 09:32:29 -06:00
Seth House
b0d4defa36 Add note about top-file only env assignment and the show_top() function 2015-08-07 16:33:55 -06:00
Seth House
163f377d13 Minor spelling, style fixes 2015-08-07 15:32:19 -06:00
Mike Place
13d544b675 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-07 10:43:19 -06:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
Justin Findlay
a83059ca01 fix test mode logic in state docs 2015-08-05 11:29:56 -06:00
Justin Findlay
0fd180e106 add test logic to state reult doc 2015-08-05 09:36:08 -06:00
Ryan Lane
b2a179fc1e Add missing module docs 2015-08-04 16:33:37 -07:00
Thomas S Hatch
0e105e3bb0 Merge pull request #25634 from iamseth/add-zenoss-module 
Add zenoss state and execution modules
 2015-07-28 09:30:45 -06:00
Pedro Algarvio
1010eef5ff Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-27 18:20:50 +01:00
David\ Beitey
f65397036f Fix doc around Include/Exclude for states 2015-07-24 09:42:25 +10:00
Seth Miller
95c0935b06 Add zenoss state and execution modules 
This change adds support for the Zenoss monitoring tool.

The execution module provides support for adding a new device and checking if a device is already in Zenoss.

The state module provides the abililty to set a state of 'monitored' which requires that a device be added to Zenoss.

Tested with Zenoss 4.2.5 Enterprise and likely will work with all in the 4.x series including Core.
 2015-07-22 14:58:28 -05:00
Colton Myers
2cb1189ff9 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/grains/core.py
 2015-07-22 12:17:58 -06:00
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
David\ Beitey
9ad0ddc549 Allow parent relative includes in state files 
This implements the solution to #25477.  Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.

This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html),
which supported relative includes, excludes, and prefixed states.  This
PR expands on existing tests for stateconf.

This also updates the documentation accordingly.
 2015-07-21 16:32:38 +10:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
David\ Beitey
bfc4f9fd85 Fix typo in extend declaration doco 2015-07-18 14:39:29 +10:00
Seth House
7422385e24 Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
Seth House
1210a53685 Add all new modules to autosummary docs 2015-07-17 15:53:13 -06:00
Pedro Algarvio
f8ee8c1ba9 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-16 20:08:28 +01:00
Ben Brady
a6bbfbfe8e return will not work in the context it is being used in - docs are misleading 2015-07-14 14:13:03 -07:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
Arnold Bechtoldt
3e2edd33d4 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-14 09:00:26 -06:00
Mike Place
ad0e40d9a1 Merge pull request #24422 from bechtoldt/refactor_es_modules 
Refactor Elasticsearch integration
 2015-07-13 14:46:10 -06:00
Arnold Bechtoldt
8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281 2015-07-11 18:25:20 +02:00
Arnold Bechtoldt
af16c76422 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-11 17:59:07 +02:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
rallytime
c0c2463b64 Partial backport of #25019 
Only backport the new .rst files for states that exist in the 2015.5 branch

Refs #25019
 2015-07-06 09:28:43 -06:00
Arnold Bechtoldt
689ba5686b add missing module documentation to references 2015-06-27 19:12:50 +02:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01:00
Jacob Hammons
c7cdd416a2 Doc bug fixes 
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
 2015-06-12 11:23:52 -06:00
Joe Julian
9cb7015568 Mark keyword version adds 2015-06-09 12:50:24 -07:00
Joe Julian
76e2583265 Merge tls changes from develop 2015-06-09 12:48:36 -07:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
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
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
rallytime
d8daa9dcd7 Merge #24185 with a couple of fixes 
Refs #24185
 2015-05-27 15:25:27 -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
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
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
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
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
Ryan Lane
f03c68655c Add missing pagerduty and boto docs 2015-05-04 23:31:26 -07:00
Erik Johnson
23a827547c Add docker-ng state docs to toctree 2015-04-30 11:19:37 -05: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
b20dbb822b fix some bad sls data in a doc 2015-04-16 11:49:35 -06:00
C. R. Oldham
977d9accf0 Allow unless, onlyif, check_cmd to use python_shell=True 2015-04-06 14:20:08 -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
Joseph Hall
ba3f6bc32c Merge pull request #22258 from nmadhok/vmware-cloud-driver 
Creating vmware cloud driver
 2015-04-02 07:31:50 -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
2fd9cf70be Merge branch 'develop' into x509 2015-03-31 11:29:46 -04:00
John Syrinek
663b19e5b7 Improves example illustrating SLS-to-Python mapping 2015-03-30 14:04:05 -05: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
John Syrinek
6558d9e6d7 Fix unless example 
The second `unless` example failed to compile
 2015-03-24 14:02:27 -05:00
Arnold Bechtoldt
db38f80945 update references, fixes #21879 2015-03-22 10:16:41 +01: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
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
Ryan Lane
1bc840a3a9 Add missing boto docs 2015-02-25 12:50:44 -08:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Arnold Bechtoldt
88dea95c6c add some cosmetic changes to the state requisites article 2015-02-07 18:46:03 +01:00
Arnold Bechtoldt
eeeff3b393 adding states to doc salt.states reference 2015-01-24 22:35:23 +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
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08: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
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
d12677156e Whitespace cleanup 2014-12-11 07:53:19 -08:00
Nitin Madhok
f168af05ef Adding state to toctree 2014-12-08 10:50:09 -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
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
988b8e621d Update docs for unless 
Note that unless is run for each associate state dec.
 2014-11-26 09:17:14 -07: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
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
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
Thomas S Hatch
cb14a8660e fix docs for mod_aggregate per #16575 2014-10-21 16:37:34 -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
Erik Johnson
af64f17fe4 Minor wording fix in highstate docs 
This fixes some grammar weirdness.
 2014-10-10 22:25:55 -05:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Colton Myers
000b391f2f State Module, not State Declaration 2014-10-07 19:25:44 -06:00
Jeremy Rosenbaum
4668480dff fixes inconsistent bar/baz variable name in state module example 2014-10-01 21:53:45 -07:00
Thomas S Hatch
3f82e3664a Merge branch '2014.7' into develop 2014-09-23 14:41:58 -06:00
rallytime
872b312770 Clarify unless and onlyif docs 2014-09-22 16:03:04 -06:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
Wolodja Wentland
3925df10d3 Fix indentation errors and inconsistencies 
Documentation for new requirements did not consistently use two spaces for
indentation or even no indentation at all.
 2014-09-18 21:02:56 +02:00
Erik Johnson
f47dd063e3 Fix sphinx build error 2014-09-17 18:00:18 -05:00