Merge branch '2016.11' into attr_file

This commit is contained in:
Justin Findlay 2017-11-30 16:34:43 -08:00 committed by GitHub
commit 9e5a40ea7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -303,6 +303,20 @@ option on the Salt master.
master_port: 4506
.. conf_minion:: publish_port
``publish_port``
---------------
Default: ``4505``
The port of the master publish server, this needs to coincide with the publish_port
option on the Salt master.
.. code-block:: yaml
publish_port: 4505
.. conf_minion:: user
``user``