Thomas S Hatch bc74de81c6 Merge branch 'develop' of https://github.com/aurynn/salt into aurynn-develop ... Conflicts: doc/topics/ssh/roster.rst		2015-01-12 11:36:24 -07:00
..
index.rst	Merge branch 'develop' of https://github.com/aurynn/salt into aurynn-develop	2015-01-12 11:36:24 -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