Skip to content

Commit

Permalink
Fix weird merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
cro committed Jun 18, 2019
1 parent 9643197 commit 9c03423
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions doc/topics/releases/2018.3.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@ To fix `#53411`_ a new configuration parameter `event_listen_queue_max_seconds`
When this is set to a value greater than 0 and `event_listen_queue` is not 0, if the oldest event
in the listen queue is older than `event_listen_queue_max_seconds`, the queue will be flushed to
returners regardless of how many events are in the queue.

.. _`#53411`: https://github.com/saltstack/salt/issues/53411

0 comments on commit 9c03423

Please sign in to comment.