rallytime 1d3aaf8097 Merge branch '2016.3' into 'carbon' ... Conflicts: - doc/ref/configuration/minion.rst		2016-10-12 15:26:27 -06:00
..
batch.rst	add versionadded	2016-04-01 18:18:54 +02:00
compound.rst	Update compound matcher docs to clarify the usage of alternate delimiters	2015-10-05 17:29:39 -06:00
globbing.rst	Whitespace cleanup	2014-12-11 07:53:19 -08:00
grains.rst	Merge branch '2015.8' into '2016.3'	2016-03-25 11:47:16 -06:00
index.rst	[2016.3] Remove "Targeting with Executions" section from docs (#36926)	2016-10-11 16:34:08 -06:00
ipcidr.rst	Spelling error	2015-02-16 12:05:47 +01:00
nodegroups.rst	Add documentation, release notes mention for new feature	2016-07-29 19:28:52 -05:00
pillar.rst	[2016.3] Merge forward from 2015.8 to 2016.3 (#32784)	2016-04-25 15:26:09 -06:00
range.rst	Comma cleanup	2014-12-12 11:39:55 -08:00