Colton Myers 8363db9d29 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop		2015-01-13 12:09:56 -07:00
..
index.rst	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-01-13 12:09:56 -07:00
roster.rst	Updates Salt SSH roster documentation, adding thin_dir and a note on setting persistent grains	2015-01-12 13:54:30 +13:00