[tinkerpop] 01/02: Merge branch 'bump-netty' into 3.4-dev

[rdale]

This is an automated email from the ASF dual-hosted git repository.

rdale pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit 693953f3324052b776a4931ad49fec7123936fe4
Merge: 4c4de66 9e44fc1
Author: Robert Dale <robd...@gmail.com>
AuthorDate: Wed Apr 29 16:00:15 2020 -0400

    Merge branch 'bump-netty' into 3.4-dev

 CHANGELOG.asciidoc | 1 +
 pom.xml            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)