rallytime 609e6e4b23 Merge branch '2016.11' into 'develop' ... Conflicts: - salt/config/__init__.py - salt/modules/win_lgpo.py - salt/utils/aws.py - tests/unit/utils/schema_test.py		2017-02-09 10:29:40 -07:00
..
logging	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00
examples.rst	Various doc updates to fix warnings in doc build	2017-02-06 16:56:58 -07:00
index.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00
master.rst	Merge branch '2016.11' into 'develop'	2017-02-09 10:29:40 -07:00
minion.rst	add note to clean_dynamic_modules	2017-02-08 14:50:04 -06:00
nonroot.rst	Remove ":doc:" references from a bunch of doc/* files	2016-12-15 16:09:27 -07:00