rallytime 76e8dd974a Merge branch '2016.3' into 'develop' ... Conflicts: - salt/state.py - tests/integration/__init__.py - tests/integration/wheel/key.py		2016-07-26 11:05:24 -06:00
..
index.rst	Improve state module docs, replace references to state.highstate/state.sls with state.apply	2016-03-21 22:56:17 -05:00
master.rst	Various spelling fixes	2016-07-16 13:17:09 -06:00
minion.rst	Add tcptraceroute suggestion to minion troubleshooting docs (#33862)	2016-06-08 12:19:27 -04:00
yaml_idiosyncrasies.rst	Merge branch '2015.8' into '2016.3'	2016-07-21 13:39:21 -06:00