You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by rd...@apache.org on 2018/06/25 13:29:23 UTC
[1/3] tinkerpop git commit: Neo Technology changed name to Neo4j,
Inc. on 7/27/2017 - CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 9b3ffe9f0 -> 3bbb957f3
Neo Technology changed name to Neo4j, Inc. on 7/27/2017 - CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/007c4aa6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/007c4aa6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/007c4aa6
Branch: refs/heads/master
Commit: 007c4aa647a897794d0ec67fb8681eaa11251f1d
Parents: 32aebb8
Author: Robert Dale <ro...@gmail.com>
Authored: Mon Jun 25 09:27:39 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Mon Jun 25 09:27:39 2018 -0400
----------------------------------------------------------------------
docs/src/reference/implementations-neo4j.asciidoc | 4 ++--
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
gremlin-server/conf/neo4j-empty.properties | 2 +-
gremlin-server/src/test/scripts/neo4j-empty.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/implementations-neo4j.asciidoc b/docs/src/reference/implementations-neo4j.asciidoc
index 1f4cc6b..a556675 100644
--- a/docs/src/reference/implementations-neo4j.asciidoc
+++ b/docs/src/reference/implementations-neo4j.asciidoc
@@ -32,9 +32,9 @@ limitations under the License.
</dependency>
----
-link:http://neo4j.com[Neo Technology] are the developers of the OLTP-based link:http://neo4j.com[Neo4j graph database].
+link:http://neo4j.com[Neo4j, Inc.] are the developers of the OLTP-based link:http://neo4j.com[Neo4j graph database].
-WARNING: Unless under a commercial agreement with Neo Technology, Neo4j is licensed
+WARNING: Unless under a commercial agreement with Neo4j, Inc., Neo4j is licensed
link:http://en.wikipedia.org/wiki/Affero_General_Public_License[AGPL]. The `neo4j-gremlin` module is licensed Apache2
because it only references the Apache2-licensed Neo4j API (not its implementation). Note that neither the
<<gremlin-console,Gremlin Console>> nor <<gremlin-server,Gremlin Server>> distribute with the Neo4j implementation
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/gremlin-server/conf/gremlin-server-neo4j.yaml
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/gremlin-server-neo4j.yaml b/gremlin-server/conf/gremlin-server-neo4j.yaml
index f88001c..09729fb 100644
--- a/gremlin-server/conf/gremlin-server-neo4j.yaml
+++ b/gremlin-server/conf/gremlin-server-neo4j.yaml
@@ -22,7 +22,7 @@
#
# bin/gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin x.y.z
#
-# Note that unless under a commercial agreement with Neo Technology,
+# Note that unless under a commercial agreement with Neo4j, Inc.,
# Neo4j is licensed AGPL.
host: localhost
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/gremlin-server/conf/neo4j-empty.properties
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/neo4j-empty.properties b/gremlin-server/conf/neo4j-empty.properties
index 0ea551b..7f3ffaa 100644
--- a/gremlin-server/conf/neo4j-empty.properties
+++ b/gremlin-server/conf/neo4j-empty.properties
@@ -23,7 +23,7 @@
#
# gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin 3.y.z
#
-# Note that unless under a commercial agreement with Neo Technology,
+# Note that unless under a commercial agreement with Neo4j, Inc.,
# Neo4j is licensed AGPL.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/007c4aa6/gremlin-server/src/test/scripts/neo4j-empty.properties
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/scripts/neo4j-empty.properties b/gremlin-server/src/test/scripts/neo4j-empty.properties
index 0ea551b..7f3ffaa 100644
--- a/gremlin-server/src/test/scripts/neo4j-empty.properties
+++ b/gremlin-server/src/test/scripts/neo4j-empty.properties
@@ -23,7 +23,7 @@
#
# gremlin-server.sh -i org.apache.tinkerpop neo4j-gremlin 3.y.z
#
-# Note that unless under a commercial agreement with Neo Technology,
+# Note that unless under a commercial agreement with Neo4j, Inc.,
# Neo4j is licensed AGPL.
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by rd...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b87a555f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b87a555f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b87a555f
Branch: refs/heads/master
Commit: b87a555f10b016136f45335091d72323a3a5d0af
Parents: 4973070 007c4aa
Author: Robert Dale <ro...@gmail.com>
Authored: Mon Jun 25 09:28:04 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Mon Jun 25 09:28:04 2018 -0400
----------------------------------------------------------------------
docs/src/reference/implementations-neo4j.asciidoc | 4 ++--
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
gremlin-server/conf/neo4j-empty.properties | 2 +-
gremlin-server/src/test/scripts/neo4j-empty.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b87a555f/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b87a555f/gremlin-server/conf/gremlin-server-neo4j.yaml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b87a555f/gremlin-server/conf/neo4j-empty.properties
----------------------------------------------------------------------
[3/3] tinkerpop git commit: Merge branch 'tp33'
Posted by rd...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3bbb957f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3bbb957f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3bbb957f
Branch: refs/heads/master
Commit: 3bbb957f3521b71298e1afc08c7eadb92d8d277b
Parents: 9b3ffe9 b87a555
Author: Robert Dale <ro...@gmail.com>
Authored: Mon Jun 25 09:28:22 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Mon Jun 25 09:28:22 2018 -0400
----------------------------------------------------------------------
docs/src/reference/implementations-neo4j.asciidoc | 4 ++--
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
gremlin-server/conf/neo4j-empty.properties | 2 +-
gremlin-server/src/test/scripts/neo4j-empty.properties | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3bbb957f/docs/src/reference/implementations-neo4j.asciidoc
----------------------------------------------------------------------