tree 46a4dc5c25510669edc2e8b70afb880e6fc5f9b2
parent af4782a25473fc048c138719eb1bfba4efe7febe
parent 88992b93dd9bd51c0d8ce1ad3b50910e43210997
author Martin Fick <mfick@codeaurora.org> 1632950017 -0600
committer Martin Fick <mfick@codeaurora.org> 1632950022 -0600

Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  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: Idd1fa46aa6e75ab65a7edc5f90442cc6f8ddc6b6