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
rallytime
1b7efa91e0
Remove references to Beryllium in relevant docs
2015-07-08 11:17:01 -06:00
Thomas S Hatch
9ca2d58b10
Merge pull request #23058 from plastikos/improvement-compound_as_list
...
[improvement] compound match as list
2015-04-25 10:57:49 -06:00
Thayne Harbaugh
6f4cfd01fc
Specify compound matches as lists
...
Compound matches, such as nodegroups, can now be specified as lists. This
avoids splitting on whitespace which may be part of a key or value.
Right now this only works for nodegroups. Making the argument to "-C"
(compound list) a JSON argument is a future task.
2015-04-24 17:00:04 -06:00
Thayne Harbaugh
993373655a
Allow grain and pillar delimiter to be specified in compound matcher syntax.
2015-04-23 23:26:49 -06:00
Thayne Harbaugh
bbd063fdee
Add a versionadded note for the leading "not"
2015-04-23 22:27:10 -06:00
Thayne Harbaugh
d6fe499f55
Allow compound expressions to begin with "not"
2015-04-22 17:38:17 -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
Thayne Harbaugh
6179839225
Improve documentation for nested nodegroup.
2015-04-09 01:43:18 -06:00
Thomas S Hatch
ecacdcbe75
Merge branch 'develop' of https://github.com/VynceMontgomery/salt into VynceMontgomery-develop
2015-03-09 11:07:14 -06:00
Erik Johnson
0aa1029f24
correction to grains example
2015-03-07 11:40:43 -07:00
Vynce Montgomery
2723cb57a3
finish changing variable name
...
a partial edit, renaming a variable for clarity, missed some cases.
2015-03-06 23:33:05 -08:00
Gabriel Fornaeus
91f58fd5ca
Spelling error
2015-02-16 12:05:47 +01:00
Gabriel Fornaeus
5d3dd815b4
Compound match example added
2015-02-16 11:25:05 +01:00
Gabriel Fornaeus
66c2184eb4
Added to main documentation
2015-02-16 11:03:43 +01:00
Colton Myers
9e9a2eab90
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
salt/fileserver/gitfs.py
salt/loader.py
2015-01-23 16:13:30 -07:00
Colton Myers
a067e6ceba
Fix the grains precedence documentation
...
Fixes #19611
2015-01-21 16:10:18 -07:00
Thomas Jackson
2fa6dad350
Comma cleanup
2014-12-12 11:39:55 -08:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Sandra Kosmalla
2096f2cafd
fix syntax error in writing grains code snippet
2014-11-05 15:13:51 -07:00
Sandra Kosmalla
de5baa14a2
fix syntax error in writing grains code snippet
2014-11-05 11:33:14 +01:00
Nitin Madhok
6ce392b236
More sphinx errors and violations
2014-09-03 16:05:07 -06:00
Nitin Madhok
938d8e90ee
More sphinx errors and violations
2014-09-01 02:33:15 -04:00
Alex Kelly
1a943480e9
Added some very basic information about actually writing grains in the
...
"writiing grains" section
2014-08-26 16:45:31 -04:00
Chris Rebert
a53ae15d23
copyedits
2014-08-22 11:59:13 -07:00
Seth House
4abc45397d
Merge remote-tracking branch 'upstream/2014.7' into develop
2014-08-21 13:23:52 -06:00
Mike Place
94543fe68d
Document seco range
...
Per request in #15093
2014-08-20 11:54:29 -06:00
Sylvain Bellemare
9f6ecc4874
Removed duplicate occurrences of the word "the"
2014-08-11 16:05:29 +02:00
Erik Johnson
a1f5be53dc
Remove pillar page from targeting toctree
2014-06-17 17:23:31 -05:00
Erik Johnson
5688da134d
Remove pillar targeting page
...
There is already a section for this in the Pillar page, no need for a
dedicated page.
2014-06-17 17:21:22 -05:00
Erik Johnson
2a5698b6ab
Add external ref target for batching page
2014-06-17 17:20:50 -05:00
Erik Johnson
3a61446f06
Add new pages to targeting toctree
2014-06-17 17:20:49 -05:00
Erik Johnson
40d96af27c
Add new docs pages for pillar and ipcidr matchers
2014-06-17 17:20:49 -05:00
rallytime
1612be139f
Added note about grain lowercase resolution
2014-06-13 16:03:38 -06:00
Erik Johnson
3ca776a167
Add reactor example for syncing custom types on initial highstate
2014-06-07 14:27:26 -05:00
Michael Lustfield
5eab3db366
minor doc touchups
2014-05-24 23:42:00 -05:00
Mike Place
63838373a5
Doc fix.
...
Resolves #6612
2014-05-15 12:08:19 -06:00
Chris Rebert
8af229253f
more copyediting
2014-04-30 13:55:48 -07:00
Chris Rebert
45981a56f9
lots of copyediting
2014-04-30 12:06:27 -07:00
Pedro Algarvio
3cd612d2c4
Fix compound example.
...
Refs 11195cbd2d
2014-04-15 10:55:26 +01:00
Thomas S Hatch
a3faf17f10
Merge pull request #11976 from cachedout/nodegroups_doc
...
Add note about master restart per nodegroups.
2014-04-14 14:21:18 -06:00
Mike Place
e3504e5a02
Add note about master restart per nodegroups.
...
Pointed out here:
https://khsing.net/2014/04/11/fight-with-saltstack-no-top-file-or-external-nodes-data-matches-found/
2014-04-14 09:39:31 -06:00
Mike Place
11195cbd2d
Fix compound matching with parens.
2014-04-11 11:33:19 -06:00
Seth House
c9f2830637
Added ref anchors for the various targeting types
2014-02-27 19:38:57 -07:00
Seth House
bf9ae06cc6
Removed old, scattered glossary entries
2014-02-27 19:38:56 -07:00
Mike Place
6af7ff5dff
First pass at refactoring Salt documentation.
2014-02-26 13:31:11 -07:00
Erik Johnson
ccc7665c42
Tweak docs for consistency and correctness
...
The grains example would traceback if the grain was not defined, so I
have replaced this example with a better one. Also made a few changes
for consistency in formatting, and made a couple terms into links to the
relevant documentation.
2014-02-23 10:19:10 -08:00
Forrest Alvarez
c8416f9b6d
Updated the globbing doc with a link to compound matching, updated the compound matchin doc with another example,
2014-01-17 05:56:59 +00:00
Forrest Alvarez
9429458ff9
updated globbing docs with an extra example
2013-12-19 06:23:00 +00:00
