tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dkupp...@apache.org
Subject [22/24] tinkerpop git commit: Merge branch 'tp33'
Date Mon, 09 Apr 2018 15:56:40 GMT
Merge branch '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/46b743d4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46b743d4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46b743d4

Branch: refs/heads/TINKERPOP-1888
Commit: 46b743d43d371061a881d6caa4a7b2983c01f172
Parents: 6040ce0 46be135
Author: Stephen Mallette <spmva@genoprime.com>
Authored: Mon Apr 9 11:31:55 2018 -0400
Committer: Stephen Mallette <spmva@genoprime.com>
Committed: Mon Apr 9 11:31:55 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/46b743d4/gremlin-javascript/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b743d4/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 71b58b2,76a2dd6..50c461d
--- 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.3.3-alpha1",
 +  "version": "3.4.0-alpha1",
    "description": "JavaScript Gremlin Language Variant",
    "author": "Apache TinkerPop team",
    "keywords": [


Mime
View raw message