rallytime c1df446b7a Merge branch '2016.3' into '2016.11' ... Conflicts: - salt/returners/postgres.py - salt/returners/postgres_local_cache.py		2017-02-10 10:18:26 -07:00
..
beacon.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
demo.rst	Remove more ":doc:" references from doc/* files	2016-12-15 15:36:44 -07:00
index.rst	Merge branch '2016.3' into '2016.11'	2017-02-10 10:18:26 -07:00
ssh.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
state.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00