rallytime 8fd53a4808 Merge branch '2016.3' into '2016.11' ... Conflicts: - doc/topics/cloud/vsphere.rst - salt/config/__init__.py - salt/daemons/masterapi.py - salt/templates/rh_ip/network.jinja - salt/utils/parsers.py - tests/unit/daemons_test.py		2016-12-02 12:18:18 -07:00
..
index.rst	Merge branch '2016.3' into '2016.11'	2016-12-02 12:18:18 -07:00