tree 72c498cda7382a5112bad5008d1dce140e2a451a
parent 5611472b663c3b2c1440133dfcdbd4b8e5eb01da
parent 18022c09ab62df440158cf936fb16ee1edfaa998
author Michael Blow <mblow@apache.org> 1639240962 -0500
committer Michael Blow <mblow@apache.org> 1639240962 -0500

Merge branch 'gerrit/log4jfix-5e11053887'

Change-Id: I7d35496c98ddd528667dd0582659f2f9eb9fe5de