Merge branch 'tp32' into tp33 Conflicts: gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46be1351 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46be1351 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46be1351 Branch: refs/heads/TINKERPOP-1903 Commit: 46be13518fd32a58118f1fa09a52e794114fb765 Parents: 39c3365 df7870a Author: Stephen Mallette <sp...@genoprime.com> Authored: Mon Apr 9 11:31:25 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Mon Apr 9 11:31:25 2018 -0400 ---------------------------------------------------------------------- docs/src/dev/developer/release.asciidoc | 5 +++++ gremlin-javascript/glv/PackageJson.template | 2 +- gremlin-javascript/pom.xml | 10 +++++++++- .../src/main/javascript/gremlin-javascript/README.md | 2 +- .../src/main/javascript/gremlin-javascript/package.json | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/docs/src/dev/developer/release.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json ---------------------------------------------------------------------- diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json index 004f307,9a6197c..76a2dd6 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json @@@ -1,6 -1,6 +1,6 @@@ { - "name": "gremlin-javascript", + "name": "gremlin", - "version": "3.2.9-alpha1", + "version": "3.3.3-alpha1", "description": "JavaScript Gremlin Language Variant", "author": "Apache TinkerPop team", "keywords": [