rallytime 52edbffc85 Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/cache/all/index.rst - doc/topics/cache/index.rst - salt/cache/localfs.py - salt/modules/boto_rds.py - salt/roster/cloud.py - salt/states/virtualenv_mod.py - tests/integration/states/test_archive.py - tests/unit/modules/test_dockermod.py - tests/unit/states/dockerng_test.py		2017-03-28 17:09:30 -06:00
..
logging	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07: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-03-28 17:09:30 -06:00
minion.rst	Merge branch '2016.11' into 'develop'	2017-03-22 17:44:08 -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