tree b910b7ac963faa2ae4823aefb6f3b69e98ac4ee2
parent b1add3a0d68f3d77cf173934a823c0a9eecfacca
parent 9d6123e96742748b0ca0c06371a2c3b6e887a301
author Michael Blow <michael.blow@couchbase.com> 1647385857 -0400
committer Michael Blow <michael.blow@couchbase.com> 1647385857 -0400

Merge branch 'gerrit/log4jfix-5e11053887'

Change-Id: I1c7cabca8bb3fc402e0db6b7de1f9715cf4456d8