tree 668a5026a9a0532bc28c3313df002e8eec268857
parent 17257b97a8f633d79e9100d8fa3c7ec1f4e5ab84
parent 729c9618774ac0bc723e2bcc84dd9cbd9f47c518
author Martin Fick <mfick@codeaurora.org> 1632949991 -0600
committer Martin Fick <mfick@codeaurora.org> 1632949996 -0600

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  fixup!: docker: Enable reruning tests without bringing down setup
  docker: Enable reruning tests without bringing down setup
  docker: Add support for "--preserve" option

Change-Id: I68cf619bb6f633bc758fc57dd855dd23f02ecae6