rallytime 513058945c Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/ref/states/requisites.rst - doc/topics/cloud/profitbricks.rst - doc/topics/cloud/vsphere.rst - doc/topics/releases/0.9.8.rst - doc/topics/releases/releasecandidate.rst - salt/cloud/clouds/vsphere.py - salt/minion.py - salt/states/archive.py - tests/unit/states/archive_test.py		2016-12-19 14:58:39 -07:00
..
index.rst	Merge branch '2016.3' into '2016.11'	2016-12-19 14:58:39 -07:00