rallytime 7554d0f42d Merge branch '2015.5' into '2015.8' ... Conflicts: - doc/ref/states/include.rst - doc/topics/cloud/reactor.rst - doc/topics/reactor/index.rst - doc/topics/releases/2015.5.10.rst - doc/topics/tutorials/states_pt5.rst - doc/topics/windows/windows-package-manager.rst - salt/config.py - salt/modules/state.py - salt/states/grains.py - tests/integration/modules/sysmod.py - tests/unit/states/grains_test.py		2016-03-24 15:48:00 -06:00
..
batch.rst	Whitespace cleanup	2014-12-11 07:53:19 -08: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.5' into '2015.8'	2016-03-24 15:48:00 -06:00
index.rst	Assorted doc bugs	2015-10-05 17:37:13 -06:00
ipcidr.rst	Spelling error	2015-02-16 12:05:47 +01:00
nodegroups.rst	Remove trailing white spaces in documentation files	2016-03-01 17:36:23 +02:00
pillar.rst	Assorted doc bugs	2015-10-05 17:37:13 -06:00
range.rst	Comma cleanup	2014-12-12 11:39:55 -08:00