rallytime 8d3c2be61c Merge branch '2018.3' into 'develop' ... Conflicts: - salt/modules/kubernetes.py - salt/modules/opkg.py - salt/modules/useradd.py - salt/output/table_out.py - salt/states/mysql_query.py - salt/states/user.py		2018-05-23 12:57:58 -04:00
..
logging	update log-granular-levels to describe what they are filtering on	2017-11-08 16:11:46 -08: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 pull request #47084 from bloomberg/26396-docpatch	2018-04-17 16:33:22 -05:00
minion.rst	Merge branch '2018.3' into 'develop'	2018-05-23 12:57:58 -04:00
nonroot.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
proxy.rst	Fix various spelling mistakes	2018-03-08 15:25:42 +01:00