rallytime e90622bc22 Merge branch '2016.11' into 'nitrogen' ... Conflicts: - salt/modules/dockermod.py - salt/modules/file.py		2017-04-11 15:03:34 -06:00
..
logging	Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11	2017-04-06 10:15:47 -05:00
examples.rst	Proxy config Examples	2017-03-21 14:59:16 +00:00
index.rst	Include proxy config instructions	2017-03-21 14:59:11 +00:00
master.rst	Merge branch '2016.11' into 'develop'	2017-04-05 13:02:14 -06:00
minion.rst	Merge branch '2016.11' into 'nitrogen'	2017-04-11 15:03:34 -06:00
nonroot.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
proxy.rst	Reference proxy options	2017-03-24 01:55:48 +00:00