subject:"\[2\/4\] tinkerpop git commit\: Merge branch 'tp32'"

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-09-05 Thread spmallette

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/49c19f1b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/49c19f1b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/49c19f1b

Branch: refs/heads/master
Commit: 49c19f1b86c4b16406539ae3e117d3ac58190ebb
Parents: 69bbbed c36fc5c
Author: Stephen Mallette 
Authored: Wed Sep 5 16:19:53 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 5 16:19:53 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../gremlin/python/jsr223/PythonTranslator.java | 12 +++-
 .../tests/driver/test_driver_remote_connection.py   |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49c19f1b/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49c19f1b/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonTranslator.java
--

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-05-08 Thread spmallette

Merge branch 'tp32' into tp33

Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7b2783f4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7b2783f4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7b2783f4

Branch: refs/heads/tp33
Commit: 7b2783f4acb7940c19464d758a28eaa00987ee4f
Parents: ea59446 fde136b
Author: Stephen Mallette 
Authored: Tue May 8 12:03:52 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 8 12:03:52 2018 -0400

--
 CHANGELOG.asciidoc | 17 -
 docs/src/upgrade/release-3.2.x-incubating.asciidoc |  4 ++--
 2 files changed, 18 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b2783f4/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b2783f4/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-27 Thread spmallette

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/9a75f921
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9a75f921
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9a75f921

Branch: refs/heads/master
Commit: 9a75f921a496813a06b1205a017e952b45c203e9
Parents: 2e74c31 2a9e7e2
Author: Stephen Mallette 
Authored: Tue Mar 27 13:33:03 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 27 13:33:03 2018 -0400

--
 .../io/graphson/GraphSONTypeSerializerV2d0.java | 16 ++--
 1 file changed, 6 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9a75f921/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
index a335baf,000..3fdb50a
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
@@@ -1,150 -1,0 +1,146 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.tinkerpop.gremlin.structure.io.graphson;
 +
 +import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 +import org.apache.tinkerpop.gremlin.process.traversal.Order;
 +import org.apache.tinkerpop.gremlin.process.traversal.Path;
 +import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 +import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 +import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 +import org.apache.tinkerpop.gremlin.structure.Column;
 +import org.apache.tinkerpop.gremlin.structure.Direction;
 +import org.apache.tinkerpop.gremlin.structure.Edge;
 +import org.apache.tinkerpop.gremlin.structure.Property;
 +import org.apache.tinkerpop.gremlin.structure.T;
 +import org.apache.tinkerpop.gremlin.structure.Vertex;
 +import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
 +import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
 +
 +import java.io.IOException;
 +import java.net.InetAddress;
 +import java.nio.ByteBuffer;
 +
 +/**
 + * GraphSON 2.0 {@code TypeSerializer}.
 + *
 + * @author Kevin Gallardo (https://kgdo.me)
 + * @author Stephen Mallette (http://stephen.genoprime.com)
 + */
 +public class GraphSONTypeSerializerV2d0 extends 
AbstractGraphSONTypeSerializer {
 +
 +GraphSONTypeSerializerV2d0(final TypeIdResolver idRes, final String 
propertyName, final TypeInfo typeInfo,
 +   final String valuePropertyName) {
 +super(idRes, propertyName, typeInfo, valuePropertyName);
 +}
 +
 +@Override
 +public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, 
final WritableTypeId writableTypeId) throws IOException {
- if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
- if (canWriteTypeId()) {
- writeTypePrefix(jsonGenerator, 
getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, 
getClassFromObject(writableTypeId.forValue)));
- }
- } else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
++

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-21 Thread dkuppitz

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/31199000
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31199000
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31199000

Branch: refs/heads/tp33
Commit: 3119900014d581daadcd995929dbd7c761dd09b4
Parents: 177aeac bddc756
Author: Daniel Kuppitz 
Authored: Wed Mar 21 12:58:41 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 21 12:58:41 2018 -0700

--
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)
--

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-20 Thread spmallette

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/9bd4fd4c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9bd4fd4c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9bd4fd4c

Branch: refs/heads/master
Commit: 9bd4fd4c07ca03218623824800ac2a127ad03311
Parents: 94484e2 b524225
Author: Stephen Mallette 
Authored: Tue Mar 20 08:00:32 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 08:00:32 2018 -0400

--
 .../structure/io/graphson/GraphSONTypeSerializerV2d0.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9bd4fd4c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
index f0d437f,000..a335baf
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV2d0.java
@@@ -1,150 -1,0 +1,150 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one
 + * or more contributor license agreements.  See the NOTICE file
 + * distributed with this work for additional information
 + * regarding copyright ownership.  The ASF licenses this file
 + * to you under the Apache License, Version 2.0 (the
 + * "License"); you may not use this file except in compliance
 + * with the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing,
 + * software distributed under the License is distributed on an
 + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 + * KIND, either express or implied.  See the License for the
 + * specific language governing permissions and limitations
 + * under the License.
 + */
 +package org.apache.tinkerpop.gremlin.structure.io.graphson;
 +
 +import org.apache.tinkerpop.gremlin.process.traversal.Operator;
 +import org.apache.tinkerpop.gremlin.process.traversal.Order;
 +import org.apache.tinkerpop.gremlin.process.traversal.Path;
 +import org.apache.tinkerpop.gremlin.process.traversal.Pop;
 +import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
 +import org.apache.tinkerpop.gremlin.process.traversal.Scope;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
 +import org.apache.tinkerpop.gremlin.structure.Column;
 +import org.apache.tinkerpop.gremlin.structure.Direction;
 +import org.apache.tinkerpop.gremlin.structure.Edge;
 +import org.apache.tinkerpop.gremlin.structure.Property;
 +import org.apache.tinkerpop.gremlin.structure.T;
 +import org.apache.tinkerpop.gremlin.structure.Vertex;
 +import org.apache.tinkerpop.gremlin.structure.VertexProperty;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
 +import org.apache.tinkerpop.shaded.jackson.core.type.WritableTypeId;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeIdResolver;
 +
 +import java.io.IOException;
 +import java.net.InetAddress;
 +import java.nio.ByteBuffer;
 +
 +/**
 + * GraphSON 2.0 {@code TypeSerializer}.
 + *
 + * @author Kevin Gallardo (https://kgdo.me)
 + * @author Stephen Mallette (http://stephen.genoprime.com)
 + */
 +public class GraphSONTypeSerializerV2d0 extends 
AbstractGraphSONTypeSerializer {
 +
 +GraphSONTypeSerializerV2d0(final TypeIdResolver idRes, final String 
propertyName, final TypeInfo typeInfo,
 +   final String valuePropertyName) {
 +super(idRes, propertyName, typeInfo, valuePropertyName);
 +}
 +
 +@Override
 +public WritableTypeId writeTypePrefix(final JsonGenerator jsonGenerator, 
final WritableTypeId writableTypeId) throws IOException {
 +if (writableTypeId.valueShape == JsonToken.VALUE_STRING) {
 +if (canWriteTypeId()) {
 +writeTypePrefix(jsonGenerator, 
getTypeIdResolver().idFromValueAndType(writableTypeId.forValue, 
getClassFromObject(writableTypeId.forValue)));
 +}
 +} else if (writableTypeId.valueShape == JsonToken.START_OBJECT) {
 +

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-03-19 Thread spmallette

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/78fd0193
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/78fd0193
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/78fd0193

Branch: refs/heads/master
Commit: 78fd019373c42f439bdfbd54a4770c0ce25f5244
Parents: 0c930c0 7023eac
Author: Stephen Mallette 
Authored: Mon Mar 19 09:14:39 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:14:39 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 4 ++--
 gremlin-server/src/main/static/NOTICE  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

[2/4] tinkerpop git commit: Merge branch 'tp32'

2018-02-02 Thread spmallette

Merge branch 'tp32'

Conflicts:
docs/src/reference/the-traversal.asciidoc


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/abfa44fc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/abfa44fc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/abfa44fc

Branch: refs/heads/master
Commit: abfa44fced98d123e47203792c2f31d66e6734cf
Parents: b86b183 df3d6d7
Author: Stephen Mallette 
Authored: Fri Feb 2 14:21:40 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Feb 2 14:21:40 2018 -0500

--
 docs/src/reference/the-traversal.asciidoc | 422 -
 1 file changed, 413 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/abfa44fc/docs/src/reference/the-traversal.asciidoc
--
diff --cc docs/src/reference/the-traversal.asciidoc
index 0376255,a7b1e29..1139306
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@@ -214,9 -210,11 +214,14 @@@ g.addE('knows').from(marko).to(peter) <
  <4> The newly created edge is a traversable object.
  <5> Two arbitrary bindings in a traversal can be joined `from()`->`to()`, 
where `id` can be provided for graphs that
  supports user provided ids.
 +<6> Add an edge between marko and peter given the directed (detached) vertex 
references.
 +<7> Add an edge between marko and peter given the directed (detached) vertex 
references.
  
+ *Additional References*
+ 
 
-link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-java.lang.String-[`addEdge(String)`]
++link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-java.lang.String-[`addEdge(String)`],
++link:http://tinkerpop.apache.org/javadocs/3.3.2-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-org.apache.tinkerpop.gremlin.process.traversal.Traversal-[`addE(Traversal)`]
+ 
  [[addvertex-step]]
  === AddVertex Step
  
@@@ -232,6 -230,11 +237,12 @@@ g.V().has('name','nothing'
  g.V().has('name','nothing').bothE()
  
  
+ *Additional References*
+ 
+ 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV--[`addV()`],
 
-link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-java.lang.String-[`addV(String)`])
++link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-java.lang.String-[`addV(String)`]),
++link:http://tinkerpop.apache.org/javadocs/3.3.2-SNAPSHOT/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-org.apache.tinkerpop.gremlin.process.traversal.Traversal-[`addV(Traversal)`]
+ 
  [[addproperty-step]]
  === AddProperty Step
  
@@@ -345,6 -361,10 +369,10 @@@ g.V().hasLabel('software').as('a','b','
   by(__.in('created').values('name').fold())
  
  
+ *Additional References*
+ 
 
-link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#as-java.lang.String-java.lang.String...-[`as(String...)`]
++link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#as-java.lang.String-java.lang.String...-[`as(String,
 String...)`]
+ 
  [[barrier-step]]
  === Barrier Step
  
@@@ -521,6 -576,10 +584,10 @@@ g.V(1).property('nickname', 'okram'
  g.V().hasLabel('person').coalesce(values('nickname'), values('name'))
  
  
+ *Additional References*
+ 
 
-link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#coalesce-org.apache.tinkerpop.gremlin.process.traversal.Traversal...-[`coalesce(Traversal)`]
++link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#coalesce-org.apache.tinkerpop.gremlin.process.traversal.Traversal...-[`coalesce(Traversal...)`]
+ 
  [[coin-step]]
  === Coin Step
  
@@@ -731,6 -833,11 +841,12 @@@ means by which they are added. The gene
  The list of steps that support `from()`-modulation are: 
<>, <>,
   <>, and <>.
  
+ *Additional References*
+ 
+

[2/4] tinkerpop git commit: Merge branch 'tp32'

2017-08-08 Thread dkuppitz

Merge branch 'tp32'

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySackTest.groovy


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f865270
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f865270
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f865270

Branch: refs/heads/TINKERPOP-1742-master
Commit: 5f865270c07f8996f0ac38ca1726e24ca9cecf79
Parents: 122a460 51caf77
Author: Stephen Mallette 
Authored: Tue Aug 8 17:13:39 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 8 17:13:39 2017 -0400

--
 .../structure/io/graphson/GraphSONModule.java   |  4 +-
 .../io/graphson/GraphSONSerializersV2d0.java| 10 +--
 .../step/sideEffect/GroovySackTest.groovy   | 89 
 3 files changed, 96 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f865270/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
index 717dcfa,2ddb37a..6221e05
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONSerializersV2d0.java
@@@ -703,4 -703,7 +703,4 @@@ class GraphSONSerializersV2d0 
  return true;
  }
  }
- }
+ }
 -
 -
 -

[2/4] tinkerpop git commit: Merge branch 'tp32'

2017-07-18 Thread spmallette

Merge branch 'tp32'

Conflicts:
CHANGELOG.asciidoc

gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a7ee024d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a7ee024d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a7ee024d

Branch: refs/heads/master
Commit: a7ee024d6e6a3c1ecdada2ac78c341b0340da08a
Parents: 751b6f5 7c72e51
Author: Stephen Mallette 
Authored: Tue Jul 18 12:45:04 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Jul 18 12:45:04 2017 -0400

--
 CHANGELOG.asciidoc  |  2 ++
 .../gremlin/groovy/engine/GremlinExecutor.java  | 27 +---
 .../server/util/ServerGremlinExecutor.java  |  6 -
 3 files changed, 19 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a7ee024d/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 3085a2e,573f681..47668bb
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -137,9 -28,10 +137,11 @@@ TinkerPop 3.2.6 (Release Date: NOT OFFI
  
  This release also includes changes from <>.
  
+ * Initialization scripts for Gremlin Server will not timeout.
+ * Added Gremlin.Net.
  * `ProfileTest` is now less stringent about assertions which will reduce 
burdens on providers.
  * `GremlinExecutor` begins timeout of script evaluation at the time the 
script was submitted and not from the time it began evaluation.
 +* Added Gremlin.Net.
  * `ReferenceFactory` and `DetachedFactory` now detach elements in collections 
accordingly.
  * Deprecated `GryoLiteMessageSerializerV1d0` in favor of 
`HaltedTraverserStrategy`.
  * Deprecated the `useMapperFromGraph` configuration option for Gremlin Server 
serializers.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a7ee024d/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a7ee024d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
--
diff --cc 
gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
index 9bd58a0,b878549..e95b61a
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
@@@ -29,8 -30,10 +29,9 @@@ import org.apache.tinkerpop.gremlin.str
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
+ import javax.script.SimpleBindings;
  import java.lang.reflect.Constructor;
  import java.util.Collections;
 -import java.util.HashSet;
  import java.util.List;
  import java.util.Map;
  import java.util.concurrent.ConcurrentHashMap;

[2/4] tinkerpop git commit: Merge branch 'tp32'

2017-03-10 Thread spmallette

Merge branch 'tp32'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a93bbf8f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a93bbf8f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a93bbf8f

Branch: refs/heads/master
Commit: a93bbf8fd9c76e7fa41efe45ef5ed7b2cdc432be
Parents: 1cd2403 61a3d12
Author: Stephen Mallette 
Authored: Fri Mar 10 06:28:38 2017 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 10 06:28:38 2017 -0500

--
 .../structure/io/graphml/GraphMLReader.java | 19 +++--
 .../tinkerpop/gremlin/structure/io/IoTest.java  | 25 ++--
 .../structure/io/graphml/graph-no-edge-ids.xml  | 30 
 3 files changed, 62 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a93bbf8f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/IoTest.java
--

[2/4] tinkerpop git commit: Merge branch 'tp32' into TINKERPOP-1507

2016-10-26 Thread okram

Merge branch 'tp32' into TINKERPOP-1507


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fc6ce291
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fc6ce291
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fc6ce291

Branch: refs/heads/tp32
Commit: fc6ce2917b5850e3538acd098030371a21e4a441
Parents: 0fec46d b262c7e
Author: Marko A. Rodriguez 
Authored: Tue Oct 25 06:05:25 2016 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Oct 25 06:05:25 2016 -0600

--
 CHANGELOG.asciidoc|  4 ++--
 docs/src/dev/developer/release.asciidoc   |  4 
 docs/src/reference/the-traversal.asciidoc |  4 ++--
 .../decoration/VertexProgramStrategy.java |  5 +
 .../server/GremlinServerIntegrateTest.java| 18 --
 5 files changed, 13 insertions(+), 22 deletions(-)
--

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[2/4] tinkerpop git commit: Merge branch 'tp32' into tp33

[2/4] tinkerpop git commit: Merge branch 'tp32'

[2/4] tinkerpop git commit: Merge branch 'tp32'

[2/4] tinkerpop git commit: Merge branch 'tp32'

[2/4] tinkerpop git commit: Merge branch 'tp32'

[2/4] tinkerpop git commit: Merge branch 'tp32' into TINKERPOP-1507

11 matches

Site Navigation

Mail list logo

Footer information