rallytime 235a768872 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/returners/influxdb_return.py - salt/states/dockerng.py - salt/utils/schedule.py - tests/unit/modules/test_docker.py - tests/unit/states/dockerng_test.py - tests/unit/utils/test_schedule.py		2017-03-22 17:44:08 -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	Add options to skip fileserver/git_pillar preflight checks	2017-02-27 20:21:53 -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	Add proxy_always_alive option from #40178	2017-03-21 14:59:16 +00:00