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

2020-06-01 Thread spmallette
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 334edb58082659b72b473610f10bff4cb95c07d9
Merge: a8e656b b3abd2f
Author: Stephen Mallette 
AuthorDate: Mon Jun 1 13:34:54 2020 -0400

Merge branch '3.3-dev' into 3.4-dev

 CHANGELOG.asciidoc  | 18 +-
 docs/src/upgrade/release-3.3.x.asciidoc |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)




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

2020-04-29 Thread 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 4c4de667dc81051590530b276a19852056f1c91a
Merge: a3cefa0 e7995ef
Author: Robert Dale 
AuthorDate: Wed Apr 29 15:57:04 2020 -0400

Merge branch '3.3-dev' into 3.4-dev

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




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

2020-01-21 Thread jorgebg
This is an automated email from the ASF dual-hosted git repository.

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

commit 89903ffdfa17bcc1eb8dfaf0d61ad541d7917ee7
Merge: edc3502 4bf2cbd
Author: Jorge Bay Gondra 
AuthorDate: Tue Jan 21 15:31:40 2020 +0100

Merge branch '3.3-dev' into 3.4-dev

 gremlin-javascript/glv/PackageJson.template| 18 +-
 .../main/javascript/gremlin-javascript/package.json| 18 +-
 2 files changed, 18 insertions(+), 18 deletions(-)