tree d132f9697d4b6bd300337087547ab9befea62f8a
parent 864bc26714111ed8fd4e7b402e7830482b57cde0
parent 8eca3e95316bacc64d296acbbe1cc5e6534954c6
author Luca Milanesio <luca.milanesio@gmail.com> 1588242297 +0100
committer Luca Milanesio <luca.milanesio@gmail.com> 1588242337 +0100

Merge branch 'stable-3.1'

* stable-3.1:
  Don't reset storage when rescheduling for collisions

Change-Id: I395aedd271fdadf2aaeabcfb740f81cf42c0c33a