saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove merge conflict

Browse source
This commit is contained in:
Ch3LL 2017-08-15 12:12:40 -04:00
parent 8a07d95212
commit 168604ba6b
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/topics/releases/2016.3.7.rst
View file

@ -7,7 +7,6 @@ Version 2016.3.7 is a bugfix release for :ref:`2016.3.0 <release-2016-3-0>`.
Changes for v2016.3.6..v2016.3.7
--------------------------------
<<<<<<< HEAD
New master configuration option `allow_minion_key_revoke`, defaults to True. This option
controls whether a minion can request that the master revoke its key. When True, a minion
can request a key revocation and the master will comply. If it is False, the key will not