rallytime 9d049e28e5 Merge branch '2016.3' into 'develop' ... Conflicts: - salt/modules/win_pkg.py - salt/states/disk.py		2016-06-15 17:13:26 -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	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
ipcidr.rst	Spelling error	2015-02-16 12:05:47 +01:00
nodegroups.rst	Merge branch '2016.3' into 'develop'	2016-06-15 17:13:26 -06: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