tree ea71da03dc6240842b916790bfc779cbbd373c70
parent 2d0caa3c09c027e71d25adee2613302d49d0d026
parent 97116eaf8d1131ce6e117b1ac5dd2ca4ace593b5
author Gregor Zurowski <gregor@zurowski.org> 1592473360 -0700
committer Gregor Zurowski <gregor@zurowski.org> 1592473360 -0700

Merge branch 'release/3.4.0' into camel-karaf-3.4.x