tree af971c86223eb4a694c1c1a3e9dc1302208ffdbd
parent 8171b78b49ee8dfce2c64838855a711ed124f34c
parent bab196c94f938ec089c4ef9eaaca1901ef521234
author David Ostrovsky <david@ostrovsky.org> 1609228316 +0100
committer David Ostrovsky <david@ostrovsky.org> 1609228316 +0100

Merge branch 'stable-3.2'

* stable-3.2:
  Adapt the test code to not mock cache instances

Change-Id: Ifc012e2c89a68df94fd80f1f669cea5832c02354