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
..
index.rst	Doc restructuring, organization, and cleanup. Updated the doc navigation.	2016-01-31 20:10:02 -07:00
syndic.rst	Merge branch '2016.11' into 'develop'	2017-03-28 17:09:30 -06:00