tree b60d7361874619d4894195c53896ec30d258e292
parent aa2b6eac28d4b4917b7286ce828db364c4b07329
parent 3a628026539d14b0dd5ab67d0034e121e0da80a7
author Dmitry Lychagin <dmitry.lychagin@couchbase.com> 1589555714 -0700
committer Dmitry Lychagin <dmitry.lychagin@couchbase.com> 1589568732 -0700

Merge commit '3a62802' from 'gerrit/mad-hatter'

Change-Id: Ia70a791f6d9fd05854017ef7692adc14a6a5f37f