tree 850eae8a4e85078bb7a09c735f34f9cbd879cd0d
parent fb394443642f30e9e588174e597f8b24888060e2
parent 951d58cf2a7cd618e1c1eabe2c64f3cd47aefb85
author Marco Miller <marco.miller@ericsson.com> 1605899260 -0500
committer Marco Miller <marco.miller@ericsson.com> 1605899260 -0500

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Stop occupying threads during retry phase
  Fix issue with indexing tasks queue

Change-Id: Ifba0ce701eb1b32385d3eb6783712a71ffca9264