You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/06/05 17:54:21 UTC

[tinkerpop] 05/06: Merge branch 'tp33' into tp34

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

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

commit 1c3acbafdb9964ff53b93ea49cc72075aa43c1aa
Merge: bab1270 3000c38
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Jun 5 13:53:47 2019 -0400

    Merge branch 'tp33' into tp34

 gremlin-console/src/main/static/LICENSE |  2 +-
 gremlin-server/src/main/static/LICENSE  |  2 +-
 gremlin-shaded/pom.xml                  |  2 +-
 gremlin-tools/gremlin-benchmark/pom.xml |  2 +-
 gremlin-tools/gremlin-io-test/pom.xml   | 12 ++++++++----
 pom.xml                                 |  4 ++--
 6 files changed, 14 insertions(+), 10 deletions(-)