rallytime 60370f5fb6 Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/daemons/masterapi.py - salt/proxy/dummy.py - salt/states/file.py - tests/integration/modules/test_state.py - tests/integration/runners/test_runner_returns.py - tests/integration/ssh/test_state.py - tests/support/parser/__init__.py - tests/unit/grains/test_core.py - tests/unit/states/test_file.py		2018-01-11 16:00:08 -05:00
..
events.rst	Add some clarifications to event and architecture documentation	2017-10-29 15:08:57 -04:00
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
master_events.rst	Adding in documention for auth_events configuration option	2018-01-05 12:29:21 -08:00