rallytime 9ad362fbde Merge branch '2016.11' into 'develop' ... Conflicts: - salt/states/kapacitor.py		2017-01-03 10:17:18 -05:00
..
index.rst	Change OSX/OS X to macOS where possible	2016-12-28 14:49:46 -07:00
master.rst	Merge branch '2016.11' into 'develop'	2016-12-20 10:03:44 -07:00
minion.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
yaml_idiosyncrasies.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00