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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java


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

Branch: refs/heads/tp33
Commit: d9ccefcea9274f00e7339b840624286e198d7832
Parents: 86b1be5 4bdb006
Author: Stephen Mallette 
Authored: Fri Oct 5 06:57:09 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Oct 5 06:57:09 2018 -0400

--
 .../groovy/jsr223/GremlinGroovyScriptEngineTest.java | 11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9ccefce/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
--
diff --cc 
gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
index 3e1d153,2803c24..83ac13d
--- 
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
+++ 
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngineTest.java
@@@ -22,13 -22,16 +22,9 @@@ import groovy.lang.Closure
  import groovy.lang.MissingPropertyException;
  import org.apache.commons.lang.exception.ExceptionUtils;
  import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 -import org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider;
 -import org.apache.tinkerpop.gremlin.groovy.NoImportCustomizerProvider;
 -import 
org.apache.tinkerpop.gremlin.groovy.jsr223.customizer.InterpreterModeCustomizerProvider;
--import org.apache.tinkerpop.gremlin.structure.Vertex;
  import org.apache.tinkerpop.gremlin.util.function.Lambda;
--import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
  import org.javatuples.Pair;
  import org.junit.Test;
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
  
  import javax.script.Bindings;
  import javax.script.ScriptContext;
@@@ -61,8 -73,8 +57,6 @@@ import static org.junit.Assert.fail
   * @author Stephen Mallette (http://stephen.genoprime.com)
   */
  public class GremlinGroovyScriptEngineTest {
--private static final Logger logger = 
LoggerFactory.getLogger(GremlinGroovyScriptEngineTest.class);
--
  private static final Object[] EMPTY_ARGS = new Object[0];
  
  @Test
@@@ -162,8 -220,78 +156,7 @@@
  engine.eval("assert 1==0");
  }
  
- 
  @Test
 -public void shouldLoadImportsViaDependencyManagerInterface() throws 
Exception {
 -final GremlinGroovyScriptEngine engine = new 
GremlinGroovyScriptEngine((CompilerCustomizerProvider) 
NoImportCustomizerProvider.INSTANCE);
 -try {
 -engine.eval("Vertex.class.getName()");
 -fail("Should have thrown an exception because no imports were 
supplied");
 -} catch (Exception se) {
 -assertTrue(se instanceof ScriptException);
 -}
 -
 -engine.addImports(new HashSet<>(Arrays.asList("import 
org.apache.tinkerpop.gremlin.structure.Vertex")));
 -assertEquals(Vertex.class.getName(), 
engine.eval("Vertex.class.getName()"));
 -}
 -
 -@Test
 -public void shouldLoadImportsViaDependencyManagerInterfaceAdditively() 
throws Exception {
 -final GremlinGroovyScriptEngine engine = new 
GremlinGroovyScriptEngine((CompilerCustomizerProvider) 
NoImportCustomizerProvider.INSTANCE);
 -try {
 -engine.eval("Vertex.class.getName()");
 -fail("Should have thrown an exception because no imports were 
supplied");
 -} catch (Exception se) {
 -assertTrue(se instanceof ScriptException);
 -}
 -
 -try {
 -engine.eval("StreamFactory.class.getName()");
 -fail("Should have thrown an exception because no imports were 
supplied");
 -} catch (Exception se) {
 -assertTrue(se instanceof ScriptException);
 -}
 -
 -engine.addImports(new HashSet<>(Arrays.asList("import " + 
Vertex.class.getCanonicalName(;
 -assertEquals(Vertex.class.getName(), 
engine.eval("Vertex.class.getName()"));
 -
 -try {
 -engine.eval("IteratorUtils.class.getName()");
 -fail("Should have thrown an exception because no imports were 
supplied");
 -} catch (Exception se) {
 -assertTrue(se instanceof ScriptException);
 -}
 -
 -engine.addImports(new HashSet<>(Arrays.asList("import " + 
IteratorUtils.class.getCanonicalName(;
 -assertEquals(Vertex.class.getName(), 

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java

gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java


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

Branch: refs/heads/tp33
Commit: 650d1e84d0b7d6f8a213a67df593c43134e156fe
Parents: 2b4c993 b510613
Author: Stephen Mallette 
Authored: Thu Oct 4 12:11:28 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 4 12:11:28 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../src/reference/gremlin-applications.asciidoc |  1 +
 .../tinkerpop/gremlin/driver/Cluster.java   | 30 ++--
 .../gremlin/driver/ConnectionPool.java  |  3 +-
 .../tinkerpop/gremlin/driver/Settings.java  | 15 +++---
 .../tinkerpop/gremlin/driver/SettingsTest.java  |  8 --
 .../server/GremlinDriverIntegrateTest.java  | 27 +-
 7 files changed, 74 insertions(+), 11 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/650d1e84/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/650d1e84/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
--
diff --cc 
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
index cee1309,c090584..fe1d896
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
@@@ -880,6 -900,28 +891,17 @@@ public final class Cluster 
  }
  
  /**
+  * Specify a valid Gremlin script that can be used to test remote 
operations. This script should be designed
+  * to return quickly with the least amount of overhead possible. By 
default, the script sends an empty string.
+  * If the graph does not support that sort of script because it 
requires all scripts to include a reference
+  * to a graph then a good option might be {@code g.inject()}.
+  */
+ public Builder validationRequest(final String script) {
+ validationRequest = script;
+ return this;
+ }
+ 
+ /**
 - * Time in milliseconds to wait before attempting to reconnect to a 
dead host after it has been marked dead.
 - *
 - * @deprecated As of release 3.2.3, the value of the initial delay is 
now the same as the {@link #reconnectInterval}.
 - */
 -@Deprecated
 -public Builder reconnectIntialDelay(final int initialDelay) {
 -this.reconnectInitialDelay = initialDelay;
 -return this;
 -}
 -
 -/**
   * Time in milliseconds to wait between retries when attempting to 
reconnect to a dead host.
   */
  public Builder reconnectInterval(final int interval) {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/650d1e84/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
--
diff --cc 
gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
index 37cecb4,c2ae045..61edd86
--- 
a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
+++ 
b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java
@@@ -409,6 -420,27 +411,11 @@@ final class Settings 
   * {@link 
org.apache.tinkerpop.gremlin.driver.Channelizer.WebSocketChannelizer}.
   */
  public String channelizer = 
Channelizer.WebSocketChannelizer.class.getName();
+ 
+ /**
+  * A valid Gremlin script that can be used to test remote operations.
+  */
+ public String validationRequest = "''";
 -
 -/**
 - * @deprecated as of 3.1.1-incubating, and not replaced as this 
property was never implemented internally
 - * as the way to establish sessions
 - */
 -@Deprecated
 -public String sessionId = null;
 -
 -/**
 - * @deprecated as of 3.1.1-incubating, and not replaced as this 
property was never implemented internally
 - * as the way to establish sessions
 - */
 -@Deprecated
 -public Optional 

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

[rdale]

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

Branch: refs/heads/tp33
Commit: c10bde339bba6fccee3e28a6ceb59d937a910986
Parents: 7148a4b e7af98b
Author: Robert Dale 
Authored: Tue Oct 2 09:44:45 2018 -0400
Committer: Robert Dale 
Committed: Tue Oct 2 09:44:45 2018 -0400

--
 docs/postprocessor/processor.awk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/tp33
Commit: 8b4f86f0b36428dfcb6d6b9914b8afccf8ba1ec2
Parents: 0f37b2e 0403156
Author: Stephen Mallette 
Authored: Fri Sep 28 09:25:19 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 28 09:25:19 2018 -0400

--
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8b4f86f0/.gitignore
--

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

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

Branch: refs/heads/tp33
Commit: 0f37b2ef19033744c3b14cb9c2c5e19763088be2
Parents: 6150499 03c3e48
Author: Stephen Mallette 
Authored: Thu Sep 27 20:57:05 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 27 20:57:05 2018 -0400

--
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

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

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

Branch: refs/heads/tp33
Commit: 615049921b40dc58f151790d5de252fcbb068aef
Parents: 393a8b1 e55b0d8
Author: Stephen Mallette 
Authored: Thu Sep 27 16:53:05 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 27 16:53:05 2018 -0400

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

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

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

Branch: refs/heads/tp33
Commit: 90e39f0627d9614c9430994f90ac4e8f82ebf23c
Parents: ef20b76 0278c15
Author: Daniel Kuppitz 
Authored: Thu Sep 27 08:05:50 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Sep 27 08:05:50 2018 -0700

--
 bin/validate-distribution.sh| 3 ++-
 docs/src/dev/developer/release.asciidoc | 3 ++-
 pom.xml | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90e39f06/docs/src/dev/developer/release.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90e39f06/pom.xml
--

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

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

Branch: refs/heads/tp33
Commit: ef20b764b19cc38c89a671d7bd32db2dcfa3677a
Parents: 2783134 07ab226
Author: Stephen Mallette 
Authored: Thu Sep 27 11:01:54 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 27 11:01:54 2018 -0400

--
 gremlin-dotnet/src/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef20b764/gremlin-dotnet/src/pom.xml
--

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

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

Branch: refs/heads/tp33
Commit: 957347fe762add09147de2ea6a2d30156fd2ad85
Parents: bf79a49 207c660
Author: Stephen Mallette 
Authored: Fri Sep 21 21:41:01 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 21 21:41:01 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../tinkerpop/gremlin/driver/Cluster.java   | 23 +++-
 2 files changed, 14 insertions(+), 10 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/957347fe/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
--

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

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

Branch: refs/heads/tp33
Commit: 84777d4a0189a37e9448154c484803f6870d80f8
Parents: 0962713 af73f45
Author: Stephen Mallette 
Authored: Thu Sep 20 15:48:17 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 20 15:48:17 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/driver/Cluster.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84777d4a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java
--

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

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

Branch: refs/heads/tp33
Commit: 096271390837729b1b7069eca66211c9c2e713a2
Parents: 834be921 0eec0c5
Author: Stephen Mallette 
Authored: Wed Sep 19 13:31:49 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 19 13:31:49 2018 -0400

--
 .../org/apache/tinkerpop/gremlin/server/Settings.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/09627139/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
--

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

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

Branch: refs/heads/tp33
Commit: 0eeeb0d0c79358b346ef0b8859bcdcb2d16ddbd9
Parents: 8ac4577 ec0e685
Author: Stephen Mallette 
Authored: Wed Sep 12 10:29:29 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 12 10:29:29 2018 -0400

--
 CHANGELOG.asciidoc  |  2 ++
 .../gremlin/structure/io/gryo/GryoVersion.java  | 14 -
 .../structure/io/gryo/UtilSerializers.java  | 33 
 3 files changed, 48 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6bb7b34,5f973e3..1cdcde7
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -526,33 -310,8 +529,33 @@@ public enum GryoVersion 
  add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
  add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, 
new JavaSerializer()));
  add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
 +
 +add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
 +add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
 +add(GryoTypeReg.of(PartitionStrategy.class, 140, new 
JavaSerializer()));
 +add(GryoTypeReg.of(SubgraphStrategy.class, 141, new 
JavaSerializer()));
 +add(GryoTypeReg.of(VertexProgramStrategy.class, 142, new 
JavaSerializer()));
 +add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
 +add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
 +add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
 +add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
 +add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
 +add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
 +add(GryoTypeReg.of(InlineFilterStrategy.class, 149));
 +add(GryoTypeReg.of(LazyBarrierStrategy.class, 150));
 +add(GryoTypeReg.of(MatchPredicateStrategy.class, 151));
 +add(GryoTypeReg.of(OrderLimitStrategy.class, 152));
 +add(GryoTypeReg.of(PathProcessorStrategy.class, 153));
 +add(GryoTypeReg.of(PathRetractionStrategy.class, 154));
 +add(GryoTypeReg.of(CountStrategy.class, 155));
 +add(GryoTypeReg.of(RepeatUnrollStrategy.class, 156));
 +add(GryoTypeReg.of(GraphFilterStrategy.class, 157));
 +add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
 +add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
 +add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
 +add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
  // skip 171, 172 to sync with tp33
- 
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));  
   // ***LAST ID***
+ 
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
  }};
  }
  
@@@ -608,8 -352,13 +613,15 @@@
  } catch (Exception ex) {
  throw new RuntimeException("Could not access " + className, 
ex);
  }
+ 
+ className = Collections.class.getName() + "$SynchronizedMap";
+ try {
+ COLLECTIONS_SYNCHRONIZED_MAP = Class.forName(className);
+ } catch (Exception ex) {
+ throw new RuntimeException("Could not access " + className, 
ex);
+ }
  }
 +
 +private Types() {}
  }
  }

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

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

Branch: refs/heads/tp33
Commit: a4970a4c37dd88f006c60c5ba063ec1af8707e29
Parents: 81f2292 c029eef
Author: Stephen Mallette 
Authored: Thu Sep 6 08:24:10 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:24:10 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 gremlin-server/conf/log4j-server.properties   | 1 +
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4970a4c/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--

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

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

Branch: refs/heads/tp33
Commit: 98ab1b05a731ce81f6a5d09310cda4fd4e1cd441
Parents: 94d9de0 3afc576
Author: Stephen Mallette 
Authored: Fri Aug 31 15:51:08 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 31 15:51:08 2018 -0400

--
 docs/src/recipes/cycle-detection.asciidoc | 33 +++---
 1 file changed, 30 insertions(+), 3 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: 5ca69985731ef85fdf9c682634fdc51505fa8728
Parents: a873468 47e0600
Author: Stephen Mallette 
Authored: Thu Aug 23 12:43:35 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Aug 23 12:43:35 2018 -0400

--
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)
--


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

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

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

Branch: refs/heads/tp33
Commit: b46c295c0019c8d690622587b3a46b8992d9fe37
Parents: 31f509d f49b279
Author: Stephen Mallette 
Authored: Mon Aug 20 12:30:43 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 20 12:30:43 2018 -0400

--
 docs/src/dev/developer/administration.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-server/src/main/bin/gremlin-server.bat


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

Branch: refs/heads/tp33
Commit: a050b6ed6380b1b97462739a75c6104f4e6e1b32
Parents: 5e48acc 00cb9a8
Author: Stephen Mallette 
Authored: Fri Aug 10 14:03:06 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 10 14:03:06 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-server/src/main/bin/gremlin-server.bat | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a050b6ed/gremlin-server/src/main/bin/gremlin-server.bat
--
diff --cc gremlin-server/src/main/bin/gremlin-server.bat
index 8ceab26,cf8e916..6c73f48
--- a/gremlin-server/src/main/bin/gremlin-server.bat
+++ b/gremlin-server/src/main/bin/gremlin-server.bat
@@@ -42,13 -41,8 +42,13 @@@ if "%1" == "install" goto instal
  :server
  
  :: Launch the application
- java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% 
%JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; 
org.apache.tinkerpop.gremlin.server.GremlinServer %*
+ java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% 
%JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;" 
org.apache.tinkerpop.gremlin.server.GremlinServer %*
  
 +:dashi
 +
 +echo NOTE: -i is deprecated. Please update your scripts. Using 'install' 
command...
 +goto install
 +
  :install
  
  set RESTVAR=
@@@ -61,4 -55,4 +61,4 @@@ goto loop
  
  :after_loop
  
- java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% 
%JAVA_ARGS% -cp %LIBDIR%/*;%EXTDIR%; 
org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
 -java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% 
%JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;" 
org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%
++java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% 
%JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;" 
org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall %RESTVAR%

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

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

Branch: refs/heads/tp33
Commit: 5e48accebc6906c0069f6fb91548a28e5af09f9b
Parents: b9ebe15 b50a3c8
Author: Stephen Mallette 
Authored: Fri Aug 10 11:35:24 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 10 11:35:24 2018 -0400

--
 docs/src/reference/preface.asciidoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--

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

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

Branch: refs/heads/tp33
Commit: 2cf551f089221f29e38627cf684fd89d6b3a3cea
Parents: 3e308f5 2d315e8
Author: Stephen Mallette 
Authored: Tue Aug 7 06:30:22 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 7 06:30:22 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 .../tinkerpop/gremlin/server/util/GremlinServerInstall.java   | 3 +++
 2 files changed, 4 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2cf551f0/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/GremlinServerInstall.java
--

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

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

Branch: refs/heads/tp33
Commit: b779a2a3e26c2b5c9c961b083b0bc1a89ead6440
Parents: 8af7837 ce94738
Author: Stephen Mallette 
Authored: Sat Aug 4 06:28:10 2018 -0400
Committer: Stephen Mallette 
Committed: Sat Aug 4 06:28:10 2018 -0400

--
 .../apache/tinkerpop/gremlin/driver/Client.java  | 19 +++
 1 file changed, 15 insertions(+), 4 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: 8af7837286c7eba82c831576a3291c77bfb727e9
Parents: dfe79c2 7fce137
Author: Daniel Kuppitz 
Authored: Wed Aug 1 11:27:04 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Aug 1 11:27:04 2018 -0700

--
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/tp33
Commit: c49c0ccb3bce76caabb4b0a9c7efe9df43801b39
Parents: ddc6694 e3018fb
Author: Stephen Mallette 
Authored: Tue Jul 31 08:35:24 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Jul 31 08:35:24 2018 -0400

--
 docs/src/dev/developer/development-environment.asciidoc | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c49c0ccb/docs/src/dev/developer/development-environment.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: ddc66941ed6340edd9009f0aa277aa8326255c68
Parents: 88b6e14 00a085a
Author: Stephen Mallette 
Authored: Mon Jul 30 11:41:21 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jul 30 11:41:21 2018 -0400

--
 .../org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ddc66941/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/remote/RemoteGraph.java
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-server/src/main/bin/gremlin-server.sh


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

Branch: refs/heads/tp33
Commit: 88b6e143dd81134074c17e5fa098f03972514273
Parents: 7985106 2b045f3
Author: Stephen Mallette 
Authored: Mon Jul 30 07:16:27 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jul 30 07:16:27 2018 -0400

--
 gremlin-server/src/main/bin/gremlin-server.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/88b6e143/gremlin-server/src/main/bin/gremlin-server.sh
--
diff --cc gremlin-server/src/main/bin/gremlin-server.sh
index fec465c,06b065a..a09e10c
--- a/gremlin-server/src/main/bin/gremlin-server.sh
+++ b/gremlin-server/src/main/bin/gremlin-server.sh
@@@ -90,191 -49,14 +90,191 @@@ els
  fi
  
  # Set Java options
 -if [ "$JAVA_OPTIONS" = "" ] ; then
 +if [[ "$JAVA_OPTIONS" = "" ]] ; then
- JAVA_OPTIONS="-Xms32m -Xmx512m"
+ JAVA_OPTIONS="-Xms512m -Xmx4096m"
  fi
  
 -# Execute the application and return its exit code
 -if [ "$1" = "-i" ]; then
 -  shift
 -  exec $JAVA -Dlog4j.configuration=conf/log4j-server.properties $JAVA_OPTIONS 
-cp $CP:$CLASSPATH 
org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall "$@"
 -else
 -  exec $JAVA -Dlog4j.configuration=conf/log4j-server.properties $JAVA_OPTIONS 
-cp $CP:$CLASSPATH org.apache.tinkerpop.gremlin.server.GremlinServer "$@"
 -fi
 +# Build Java CLASSPATH
 +CP="$GREMLIN_HOME/conf/"
 +CP="$CP":$( echo $GREMLIN_HOME/lib/*.jar . | sed 's/ /:/g')
 +CP="$CP":$( find -L "$GREMLIN_HOME"/ext -mindepth 1 -maxdepth 1 -type d | \
 +sort | sed 's/$/\/plugin\/*/' | tr '\n' ':' )
 +
 +CLASSPATH="${CLASSPATH:-}:$CP"
 +
 +GREMLIN_SERVER_CMD=org.apache.tinkerpop.gremlin.server.GremlinServer
 
+GREMLIN_INSTALL_CMD=org.apache.tinkerpop.gremlin.server.util.GremlinServerInstall
 +
 +
 +isRunning() {
 +  if [[ -r "$PID_FILE" ]] ; then
 +PID=$(cat "$PID_FILE")
 +ps -p "$PID" &> /dev/null
 +return $?
 +  else
 +return 1
 +  fi
 +}
 +
 +status() {
 +  isRunning
 +  RUNNING=$?
 +if [[ $RUNNING -gt 0 ]]; then
 +  echo Server not running
 +else
 +  echo Server running with PID $(cat "$PID_FILE")
 +fi
 +}
 +
 +stop() {
 +  isRunning
 +  RUNNING=$?
 +  if [[ $RUNNING -gt 0 ]]; then
 +echo Server not running
 +rm -f "$PID_FILE"
 +  else
 +kill "$PID" &> /dev/null || { echo "Unable to kill server [$PID]"; exit 
1; }
 +for i in $(seq 1 60); do
 +  ps -p "$PID" &> /dev/null || { echo "Server stopped [$PID]"; rm -f 
"$PID_FILE"; return 0; }
 +  [[ $i -eq 30 ]] && kill "$PID" &> /dev/null
 +  sleep 1
 +done
 +echo "Unable to kill server [$PID]";
 +exit 1;
 +  fi
 +}
 +
 +start() {
 +  isRunning
 +  RUNNING=$?
 +  if [[ $RUNNING -eq 0 ]]; then
 +echo Server already running with PID $(cat "$PID_FILE").
 +exit 1
 +  fi
 +
 +  if [[ -z "$RUNAS" ]]; then
 +
 +mkdir -p "$LOG_DIR" &>/dev/null
 +if [[ ! -d "$LOG_DIR" ]]; then
 +  echo ERROR: LOG_DIR $LOG_DIR does not exist and could not be created.
 +  exit 1
 +fi
 +
 +mkdir -p "$PID_DIR" &>/dev/null
 +if [[ ! -d "$PID_DIR" ]]; then
 +  echo ERROR: PID_DIR $PID_DIR does not exist and could not be created.
 +  exit 1
 +fi
 +
 +$JAVA -Dlog4j.configuration=$LOG4J_CONF $JAVA_OPTIONS -cp $CP:$CLASSPATH 
$GREMLIN_SERVER_CMD "$GREMLIN_YAML" >> "$LOG_FILE" 2>&1 &
 +PID=$!
 +disown $PID
 +echo $PID > "$PID_FILE"
 +  else
 +
 +su -c "mkdir -p $LOG_DIR &>/dev/null"  "$RUNAS"
 +if [[ ! -d "$LOG_DIR" ]]; then
 +  echo ERROR: LOG_DIR $LOG_DIR does not exist and could not be created.
 +  exit 1
 +fi
 +
 +su -c "mkdir -p $PID_DIR &>/dev/null"  "$RUNAS"
 +if [[ ! -d "$PID_DIR" ]]; then
 +  echo ERROR: PID_DIR $PID_DIR does not exist and could not be created.
 +  exit 1
 +fi
 +
 +su -c "$JAVA -Dlog4j.configuration=$LOG4J_CONF $JAVA_OPTIONS -cp 
$CP:$CLASSPATH $GREMLIN_SERVER_CMD \"$GREMLIN_YAML\" >> \"$LOG_FILE\" 2>&1 & 
echo \$! "  "$RUNAS" > "$PID_FILE"
 +chown "$RUNAS" "$PID_FILE"
 +  fi
 +
 +  isRunning
 +  RUNNING=$?
 +  if [[ $RUNNING -eq 0 ]]; then
 +echo Server started $(cat "$PID_FILE").
 +exit 0
 +  else
 +echo Server failed
 +exit 1
 +  fi
 +
 +}
 +
 +startForeground() {
 +  isRunning
 +  RUNNING=$?
 +  if [[ $RUNNING -eq 0 ]]; then
 +echo Server already running with PID $(cat "$PID_FILE").
 +exit 1
 +  fi
 +
 +  if [[ -z "$RUNAS" ]]; then
 +$JAVA 

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

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

Branch: refs/heads/tp33
Commit: 798510679b5af84ffc1ecdfa5ef86d52229cbc99
Parents: 9b693c0 3b8c828
Author: Stephen Mallette 
Authored: Fri Jul 27 16:29:37 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Jul 27 16:29:37 2018 -0400

--
 docs/src/recipes/element-existence.asciidoc | 91 
 docs/src/recipes/index.asciidoc |  2 +
 2 files changed, 93 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/79851067/docs/src/recipes/index.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: ffb8c3e4e6e8a87d9fea31f2a2f92deb7f809ac5
Parents: 445a8bf 0bd9b5a
Author: Stephen Mallette 
Authored: Thu Jul 26 08:28:33 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Jul 26 08:28:33 2018 -0400

--
 CHANGELOG.asciidoc|  1 +
 .../traversal/dsl/graph/GraphTraversalSource.java | 18 +++---
 .../dsl/graph/GraphTraversalSourceTest.java   |  9 ++---
 3 files changed, 10 insertions(+), 18 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ffb8c3e4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-test/features/map/Select.feature


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

Branch: refs/heads/tp33
Commit: 445a8bf0b75f8f6ee246c5bd9277f0e902db246c
Parents: 5eaf312 3be3550
Author: Stephen Mallette 
Authored: Wed Jul 25 12:25:51 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 12:25:51 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs   |  3 +--
 .../Gherkin/IgnoreException.cs |  3 ---
 .../gremlin-javascript/test/cucumber/feature-steps.js  |  3 +--
 gremlin-python/src/main/jython/radish/feature_steps.py |  2 +-
 gremlin-test/features/map/Select.feature   | 13 +
 5 files changed, 8 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/445a8bf0/gremlin-test/features/map/Select.feature
--

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

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

Branch: refs/heads/tp33
Commit: 5eaf312c000d3145707513f20109956f5f97265a
Parents: 1bd35dc fd64360
Author: Stephen Mallette 
Authored: Wed Jul 25 11:30:52 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 11:30:52 2018 -0400

--
 .../gremlin-javascript/lib/structure/io/type-serializers.js   | 2 +-
 .../javascript/gremlin-javascript/test/unit/graphson-test.js  | 7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5eaf312c/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
--

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

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

Branch: refs/heads/tp33
Commit: 1bd35dcc5383373ed07fb72fdba7da274f982497
Parents: 421839d db46c0f
Author: Stephen Mallette 
Authored: Wed Jul 25 09:46:11 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 09:46:11 2018 -0400

--
 CHANGELOG.asciidoc|  1 +
 .../lib/structure/io/graph-serializer.js  |  2 ++
 .../lib/structure/io/type-serializers.js  | 18 ++
 .../gremlin-javascript/test/unit/graphson-test.js |  8 
 4 files changed, 29 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1bd35dcc/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1bd35dcc/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
--
diff --cc 
gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
index 3b2b9e6,4bc2935..5044ee7
--- 
a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
+++ 
b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
@@@ -283,78 -293,9 +300,79 @@@ class TSerializer extends TypeSerialize
}
  }
  
 +class ArraySerializer extends TypeSerializer {
 +  constructor(typeKey) {
 +super();
 +this.typeKey = typeKey;
 +  }
 +
 +  deserialize(obj) {
 +const value = obj[valueKey];
 +if (!Array.isArray(value)) {
 +  throw new Error('Expected Array, obtained: ' + value);
 +}
 +return value.map(x => this.reader.read(x));
 +  }
 +
 +  /** @param {Array} item */
 +  serialize(item) {
 +return {
 +  [typeKey]: this.typeKey,
 +  [valueKey]: item.map(x => this.writer.adaptObject(x))
 +};
 +  }
 +
 +  canBeUsedFor(value) {
 +return Array.isArray(value);
 +  }
 +}
 +
 +class MapSerializer extends TypeSerializer {
 +  deserialize(obj) {
 +const value = obj[valueKey];
 +if (!Array.isArray(value)) {
 +  throw new Error('Expected Array, obtained: ' + value);
 +}
 +const result = new Map();
 +for (let i = 0; i < value.length; i += 2) {
 +  result.set(this.reader.read(value[i]), this.reader.read(value[i + 1]));
 +}
 +return result;
 +  }
 +
 +  /** @param {Map} map */
 +  serialize(map) {
 +const arr = [];
 +map.forEach((v, k) => {
 +  arr.push(this.writer.adaptObject(k));
 +  arr.push(this.writer.adaptObject(v));
 +});
 +return {
 +  [typeKey]: 'g:Map',
 +  [valueKey]: arr
 +};
 +  }
 +
 +  canBeUsedFor(value) {
 +return value instanceof Map;
 +  }
 +}
 +
 +class ListSerializer extends ArraySerializer {
 +  constructor() {
 +super('g:List');
 +  }
 +}
 +
 +class SetSerializer extends ArraySerializer {
 +  constructor() {
 +super('g:Set');
 +  }
 +}
 +
  module.exports = {
BytecodeSerializer,
+   DateSerializer,
EdgeSerializer,
EnumSerializer,
LambdaSerializer,

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

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

Branch: refs/heads/tp33
Commit: 421839d2744d679afe922e55e814b34fb61cfec5
Parents: ebee26c f56a3e7
Author: Stephen Mallette 
Authored: Wed Jul 25 08:59:31 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 08:59:31 2018 -0400

--
 docs/src/reference/gremlin-variants.asciidoc |  2 +-
 docs/src/reference/the-traversal.asciidoc| 63 +++
 2 files changed, 64 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/421839d2/docs/src/reference/gremlin-variants.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/421839d2/docs/src/reference/the-traversal.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: ebee26c47fd3ec341d95fcdd6d87190d27e37f27
Parents: 1ca5ef3 9986493
Author: Stephen Mallette 
Authored: Wed Jul 25 07:43:46 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 07:43:46 2018 -0400

--
 docs/src/reference/gremlin-variants.asciidoc | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ebee26c4/docs/src/reference/gremlin-variants.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: 1ca5ef3d15bfc7acc2f53268ec8a60f6f7e956c9
Parents: 3aa6dcf ecd944e
Author: Stephen Mallette 
Authored: Wed Jul 25 07:01:05 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 25 07:01:05 2018 -0400

--
 CHANGELOG.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

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

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

Branch: refs/heads/tp33
Commit: 05432a79296dd6154233a2b62685dbf60f9eb16f
Parents: b757173 ec561d8
Author: Stephen Mallette 
Authored: Sun Jul 22 15:11:05 2018 -0400
Committer: Stephen Mallette 
Committed: Sun Jul 22 15:11:05 2018 -0400

--
 docs/src/recipes/collections.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05432a79/docs/src/recipes/collections.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: 398ab9c90b41592759e7b14406b157ce7eed7b6d
Parents: 0518927 0272a2e
Author: Stephen Mallette 
Authored: Wed Jul 18 16:30:26 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jul 18 16:30:26 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/driver/Handler.java | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/398ab9c9/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
--

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

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

Branch: refs/heads/tp33
Commit: 8bf7a76f32670ec85cf0de40e982d072b2f4b008
Parents: 53784f9 6fd3036
Author: Stephen Mallette 
Authored: Mon Jul 16 15:47:26 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jul 16 15:47:26 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8bf7a76f/docs/src/reference/gremlin-applications.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: 53784f99780ad8b19cbafdf8ac4ef03385ad20fd
Parents: a6ba2d5 e1d57d6
Author: Stephen Mallette 
Authored: Mon Jul 16 15:33:07 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jul 16 15:33:07 2018 -0400

--
 docs/src/dev/developer/for-committers.asciidoc | 26 +++--
 1 file changed, 24 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/53784f99/docs/src/dev/developer/for-committers.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: a6ba2d5b225de0cba79370774bc211d572516bfc
Parents: bf07f13 3dcabd4
Author: Stephen Mallette 
Authored: Thu Jul 12 10:51:23 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Jul 12 10:51:23 2018 -0400

--
 CHANGELOG.asciidoc   | 1 +
 .../java/org/apache/tinkerpop/gremlin/driver/Handler.java| 8 
 .../gremlin/driver/handler/WebSocketClientHandler.java   | 5 -
 3 files changed, 9 insertions(+), 5 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a6ba2d5b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Handler.java
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java


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

Branch: refs/heads/tp33
Commit: 1f15781ac049008e50b63e3632c86158e570ef15
Parents: 65ba04f 309957b
Author: Stephen Mallette 
Authored: Sat Jun 30 06:28:22 2018 -0400
Committer: Stephen Mallette 
Committed: Sat Jun 30 06:28:22 2018 -0400

--
 .../dsl/graph/GraphTraversalSource.java | 94 +++-
 1 file changed, 93 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f15781a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 81a0a71,baba19c..bc3ef9e
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@@ -127,6 -139,15 +133,9 @@@ public class GraphTraversalSource imple
  return (GraphTraversalSource) 
TraversalSource.super.withoutStrategies(traversalStrategyClasses);
  }
  
 -@Override
 -@Deprecated
 -public GraphTraversalSource withBindings(final Bindings bindings) {
 -return (GraphTraversalSource) 
TraversalSource.super.withBindings(bindings);
 -}
 -
+ /**
+  * {@inheritDoc}
+  */
  @Override
  public GraphTraversalSource withComputer(final Computer computer) {
  return (GraphTraversalSource) 
TraversalSource.super.withComputer(computer);
@@@ -247,6 -319,30 +307,10 @@@
  
   SPAWNS
  
 -/**
 - * @deprecated As of release 3.1.0, replaced by {@link #addV()}
 - */
 -@Deprecated
 -public GraphTraversal addV(final Object... keyValues) {
 -ElementHelper.legalPropertyKeyValueArray(keyValues);
 -if (keyValues.length != 0 && keyValues[0].equals(T.label)) {
 -final GraphTraversal traversal = 
this.addV(keyValues[1].toString());
 -for (int i = 2; i < keyValues.length; i = i + 2) {
 -traversal.property(keyValues[i], keyValues[i + 1]);
 -}
 -return traversal;
 -} else {
 -final GraphTraversal traversal = this.addV();
 -for (int i = 0; i < keyValues.length; i = i + 2) {
 -traversal.property(keyValues[i], keyValues[i + 1]);
 -}
 -return traversal;
 -}
 -}
+ 
+ /**
+  * Spawns a {@link GraphTraversal} by adding a vertex with the specified 
label.
+  */
  public GraphTraversal addV(final String label) {
  final GraphTraversalSource clone = this.clone();
  clone.bytecode.addStep(GraphTraversal.Symbols.addV, label);
@@@ -254,34 -350,19 +318,49 @@@
  return traversal.addStep(new AddVertexStartStep(traversal, label));
  }
  
+ /**
++ * Spawns a {@link GraphTraversal} by adding a vertex with the label as 
determined by a {@link Traversal}.
++ */
 +public GraphTraversal addV(final Traversal 
vertexLabelTraversal) {
 +final GraphTraversalSource clone = this.clone();
 +clone.bytecode.addStep(GraphTraversal.Symbols.addV, 
vertexLabelTraversal);
 +final GraphTraversal.Admin traversal = new 
DefaultGraphTraversal<>(clone);
 +return traversal.addStep(new AddVertexStartStep(traversal, 
vertexLabelTraversal));
 +}
 +
++/**
+  * Spawns a {@link GraphTraversal} by adding a vertex with the default 
label.
+  */
  public GraphTraversal addV() {
  final GraphTraversalSource clone = this.clone();
  clone.bytecode.addStep(GraphTraversal.Symbols.addV);
  final GraphTraversal.Admin traversal = new 
DefaultGraphTraversal<>(clone);
 -return traversal.addStep(new AddVertexStartStep(traversal, null));
 +return traversal.addStep(new AddVertexStartStep(traversal, 
(String)null));
 +}
 +
++/**
++ * Spawns a {@link GraphTraversal} by adding a edge with the specified 
label.
++ */
 +public GraphTraversal addE(final String label) {
 +final GraphTraversalSource clone = this.clone();
 +clone.bytecode.addStep(GraphTraversal.Symbols.addE, label);
 +final GraphTraversal.Admin traversal = new 
DefaultGraphTraversal<>(clone);
 +return traversal.addStep(new 

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

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

Branch: refs/heads/tp33
Commit: 65ba04f19dd218f10dbf45ee169db7f688357721
Parents: ef888a1 34a648b
Author: Stephen Mallette 
Authored: Fri Jun 29 15:21:42 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 29 15:21:42 2018 -0400

--
 gremlin-dotnet/glv/generate.groovy | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/65ba04f1/gremlin-dotnet/glv/generate.groovy
--

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

[rdale]

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/tp33
Commit: b87a555f10b016136f45335091d72323a3a5d0af
Parents: 4973070 007c4aa
Author: Robert Dale 
Authored: Mon Jun 25 09:28:04 2018 -0400
Committer: Robert Dale 
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
--

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

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

Branch: refs/heads/tp33
Commit: 1309777d7772818ef0810182a09a30503eeefef8
Parents: e1ef8b6 aef2f6c
Author: Stephen Mallette 
Authored: Fri Jun 22 08:31:53 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Jun 22 08:31:53 2018 -0400

--
 docs/src/reference/the-traversal.asciidoc | 19 +++
 1 file changed, 19 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1309777d/docs/src/reference/the-traversal.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: e1ef8b623cc20823fd93dcff1bb659832d8812a1
Parents: c43a882 7c7dddb
Author: Stephen Mallette 
Authored: Wed Jun 20 06:24:09 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Jun 20 06:24:09 2018 -0400

--
 docs/src/reference/the-traversal.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1ef8b62/docs/src/reference/the-traversal.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: 5d71dc1c50d7ba2404a058f5be56fb1da8108583
Parents: ba82a5c a4e087d
Author: Stephen Mallette 
Authored: Mon Jun 18 16:06:26 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 18 16:06:26 2018 -0400

--
 gremlin-python/src/main/jython/tests/conftest.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d71dc1c/gremlin-python/src/main/jython/tests/conftest.py
--

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

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

Branch: refs/heads/tp33
Commit: ab9d10544d9d52ddb33111b0097e043a013362cc
Parents: 7b6ba39 891bfa3
Author: Stephen Mallette 
Authored: Mon Jun 18 09:44:53 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 18 09:44:53 2018 -0400

--
 CHANGELOG.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


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

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
docs/src/reference/gremlin-applications.asciidoc


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

Branch: refs/heads/tp33
Commit: c790459dd0b352839c10e987b459579c13e4b7e3
Parents: d4c76a6 2495e8e
Author: Stephen Mallette 
Authored: Mon Jun 18 09:26:00 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 18 09:26:00 2018 -0400

--
 CHANGELOG.asciidoc   | 3 ++-
 docs/src/reference/gremlin-applications.asciidoc | 2 +-
 docs/src/upgrade/release-3.2.x-incubating.asciidoc   | 8 
 .../gremlin/groovy/jsr223/GroovyCompilerGremlinPlugin.java   | 7 +++
 4 files changed, 18 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c790459d/docs/src/reference/gremlin-applications.asciidoc
--

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

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

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

Branch: refs/heads/tp33
Commit: 55fcbdc45bf3c6a78d7ecbbe2b13fe24fbb5ba1c
Parents: a0b7ce5 e8e22af
Author: Stephen Mallette 
Authored: Thu Jun 7 07:37:35 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Jun 7 07:37:35 2018 -0400

--
 hadoop-gremlin/pom.xml | 18 --
 1 file changed, 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/55fcbdc4/hadoop-gremlin/pom.xml
--

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

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

Branch: refs/heads/tp33
Commit: d7b756b164c3d063741d2ea9d39d710d3bf7aadd
Parents: d4faa66 962093e
Author: Stephen Mallette 
Authored: Mon Jun 4 17:04:19 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 17:04:19 2018 -0400

--
 .../traversal/step/map/PropertyElementStep.java | 48 
 1 file changed, 48 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: ee65d5f2ba191b65a383282695074bac38a4d885
Parents: edc0a46 144c698
Author: Stephen Mallette 
Authored: Mon Jun 4 13:57:22 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:57:22 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-server/pom.xml
--

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

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

Branch: refs/heads/tp33
Commit: 00f77fad23f22c79014a2da8343e5f59e6a6f167
Parents: 31a3b44 c2ff47c
Author: Stephen Mallette 
Authored: Mon Jun 4 13:28:49 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:28:49 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00f77fad/docs/src/reference/gremlin-applications.asciidoc
--

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

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

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

Branch: refs/heads/tp33
Commit: 04969222bf44ce5131d71fb8e53538af36747487
Parents: 2862ff9 1b59b9e
Author: Stephen Mallette 
Authored: Tue May 29 16:15:13 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 29 16:15:13 2018 -0400

--
 docs/src/reference/the-traversal.asciidoc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/04969222/docs/src/reference/the-traversal.asciidoc
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
docs/src/tutorials/getting-started/index.asciidoc


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

Branch: refs/heads/tp33
Commit: 2862ff989c810710583f3157a66cb9ef73f3d968
Parents: ae9d7f6 6feff18
Author: Stephen Mallette 
Authored: Tue May 29 12:53:22 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 29 12:53:22 2018 -0400

--
 docs/src/dev/provider/index.asciidoc|  80 ++
 .../src/reference/gremlin-applications.asciidoc |   5 +-
 .../reference/implementations-neo4j.asciidoc|  10 +-
 docs/src/reference/intro.asciidoc   | 148 ++-
 docs/src/reference/the-graph.asciidoc   |  40 ++---
 5 files changed, 126 insertions(+), 157 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/dev/provider/index.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/reference/implementations-neo4j.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2862ff98/docs/src/reference/the-graph.asciidoc
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java

spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java


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

Branch: refs/heads/tp33
Commit: 3891777e4b30665bd47a5ead9e50871f37f7e9d8
Parents: a708cc3 bd85e5f
Author: Stephen Mallette 
Authored: Tue May 22 07:08:22 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 22 07:08:22 2018 -0400

--
 CHANGELOG.asciidoc  |   1 +
 .../process/computer/SparkGraphComputer.java| 104 ---
 2 files changed, 93 insertions(+), 12 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3891777e/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
--
diff --cc 
spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
index dafe613,4c896cd..5184db6
--- 
a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
+++ 
b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
@@@ -33,9 -33,7 +33,9 @@@ import org.apache.spark.Partitioner
  import org.apache.spark.api.java.JavaPairRDD;
  import org.apache.spark.api.java.JavaSparkContext;
  import org.apache.spark.launcher.SparkLauncher;
++import org.apache.spark.serializer.KryoRegistrator;
 +import org.apache.spark.serializer.KryoSerializer;
+ import org.apache.spark.serializer.Serializer;
  import org.apache.spark.storage.StorageLevel;
  import org.apache.tinkerpop.gremlin.hadoop.Constants;
  import 
org.apache.tinkerpop.gremlin.hadoop.process.computer.AbstractHadoopGraphComputer;
@@@ -87,7 -78,16 +87,17 @@@ import java.util.concurrent.Executors
  import java.util.concurrent.Future;
  import java.util.concurrent.ThreadFactory;
  
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_GRAPH_STORAGE_LEVEL;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_PERSIST_CONTEXT;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_PERSIST_STORAGE_LEVEL;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_SKIP_GRAPH_CACHE;
+ import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.GREMLIN_SPARK_SKIP_PARTITIONER;
++import static 
org.apache.tinkerpop.gremlin.hadoop.Constants.SPARK_KRYO_REGISTRATION_REQUIRED;
+ import static org.apache.tinkerpop.gremlin.hadoop.Constants.SPARK_SERIALIZER;
+ 
  /**
+  * {@link GraphComputer} implementation for Apache Spark.
+  *
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
  public final class SparkGraphComputer extends AbstractHadoopGraphComputer {
@@@ -116,10 -112,15 +126,14 @@@
  public SparkGraphComputer(final HadoopGraph hadoopGraph) {
  super(hadoopGraph);
  this.sparkConfiguration = new HadoopConfiguration();
 -ConfigurationUtils.copy(this.hadoopGraph.configuration(), 
this.sparkConfiguration);
  }
  
+ /**
+  * Sets the number of workers. If the {@code spark.master} configuration 
is configured with "local" then it will
+  * change that configuration to use the specified number of worker 
threads.
+  */
  @Override
- public GraphComputer workers(final int workers) {
+ public SparkGraphComputer workers(final int workers) {
  super.workers(workers);
  if (this.sparkConfiguration.containsKey(SparkLauncher.SPARK_MASTER) 
&& 
this.sparkConfiguration.getString(SparkLauncher.SPARK_MASTER).startsWith("local"))
 {
  this.sparkConfiguration.setProperty(SparkLauncher.SPARK_MASTER, 
"local[" + this.workers + "]");
@@@ -134,6 -135,56 +148,72 @@@
  return this;
  }
  
+ /**
+  * Sets the configuration option for {@code spark.master} which is the 
cluster manager to connect to which may be
+  * one of the https://spark.apache.org/docs/latest/submitting-applications.html#master-urls;>allowed
 master URLs.
+  */
+ public SparkGraphComputer master(final String clusterManager) {
+ return configure(SparkLauncher.SPARK_MASTER, clusterManager);
+ }
+ 
+ /**
+  * Determines if the 

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

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

Branch: refs/heads/tp33
Commit: e04f2630c2ef3c512dde612a8628b350e442d31a
Parents: 558e814 7c69607
Author: Stephen Mallette 
Authored: Mon May 21 09:21:52 2018 -0400
Committer: Stephen Mallette 
Committed: Mon May 21 09:21:52 2018 -0400

--
 .travis.yml| 6 +++---
 gremlin-javascript/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e04f2630/gremlin-javascript/pom.xml
--

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

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

Branch: refs/heads/tp33
Commit: ef2cd5720e291038c8f3f1dea105e76cf740b153
Parents: b04e024 ae562c1
Author: Stephen Mallette 
Authored: Thu May 17 15:42:24 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 17 15:42:24 2018 -0400

--
 .../computer/traversal/TraversalVertexProgram.java | 17 +
 .../traversal/dsl/graph/GraphTraversal.java|  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2cd572/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
--

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

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

Branch: refs/heads/tp33
Commit: 5171afd9f408feab5c7bfcdce13a44e5ec89e823
Parents: 0b282e4 4adca20
Author: Stephen Mallette 
Authored: Mon May 14 16:36:27 2018 -0400
Committer: Stephen Mallette 
Committed: Mon May 14 16:36:27 2018 -0400

--
 docs/src/dev/developer/release.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5171afd9/docs/src/dev/developer/release.asciidoc
--

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

[davebshow]

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

Branch: refs/heads/tp33
Commit: 0b282e47fab2ddde978439be5831542ca26d88f4
Parents: 7158768 58d3d40
Author: davebshow 
Authored: Mon May 14 12:43:06 2018 -0700
Committer: davebshow 
Committed: Mon May 14 12:43:06 2018 -0700

--
 CHANGELOG.asciidoc | 2 ++
 1 file changed, 2 insertions(+)
--


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

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

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

Branch: refs/heads/tp33
Commit: 42e509c392b1d660801b995a4383c1f9ab41c2d4
Parents: 81ea06a 770375d
Author: Stephen Mallette 
Authored: Mon May 14 11:52:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon May 14 11:52:20 2018 -0400

--
 docs/src/dev/developer/release.asciidoc| 2 +-
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42e509c3/docs/src/dev/developer/release.asciidoc
--

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

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

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

Branch: refs/heads/tp33
Commit: 81ea06a0fa9087467c059f63907535c81d083404
Parents: 044cd1f 90e7476
Author: Stephen Mallette 
Authored: Mon May 14 10:55:36 2018 -0400
Committer: Stephen Mallette 
Committed: Mon May 14 10:55:36 2018 -0400

--
 .../developer/development-environment.asciidoc  | 56 ++--
 docs/src/dev/developer/release.asciidoc | 46 
 2 files changed, 51 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ea06a0/docs/src/dev/developer/development-environment.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ea06a0/docs/src/dev/developer/release.asciidoc
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
docs/src/dev/developer/release.asciidoc


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

Branch: refs/heads/tp33
Commit: 044cd1f47f18e612d9bef3ba85edacc24909b142
Parents: 906f244 cc7d2e2
Author: Stephen Mallette 
Authored: Mon May 14 09:04:58 2018 -0400
Committer: Stephen Mallette 
Committed: Mon May 14 09:04:58 2018 -0400

--
 docs/src/dev/developer/release.asciidoc | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/044cd1f4/docs/src/dev/developer/release.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: eb79f398d10bd1294762b923d2bdc8d72959b7e9
Parents: 68d39dc 288b455
Author: Stephen Mallette 
Authored: Fri May 11 20:04:35 2018 -0400
Committer: Stephen Mallette 
Committed: Fri May 11 20:04:35 2018 -0400

--
 pom.xml | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb79f398/pom.xml
--

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

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

Branch: refs/heads/tp33
Commit: b63e2f96a88c4c8f811cd12cfdfe5ac63ad2d4bb
Parents: e574906 ac161fa
Author: Stephen Mallette 
Authored: Thu May 10 11:57:34 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:57:34 2018 -0400

--
 CHANGELOG.asciidoc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


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

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

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

Branch: refs/heads/tp33
Commit: fa5e7affe960d762bbcb7f7d8526e13a4fa596d9
Parents: 4e3a0a9 cfbe2ce
Author: Stephen Mallette 
Authored: Thu May 10 11:28:00 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:28:00 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-console/src/main/static/NOTICE
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-server/src/main/static/NOTICE
--

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

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

Branch: refs/heads/tp33
Commit: 4e3a0a9bc5b72d7d98cb4b95d647f62dea23c9ee
Parents: 2d39f9b 2f8f74a
Author: Daniel Kuppitz 
Authored: Tue May 8 12:43:51 2018 -0700
Committer: Daniel Kuppitz 
Committed: Tue May 8 12:43:51 2018 -0700

--
 bin/validate-distribution.sh | 19 +--
 1 file changed, 9 insertions(+), 10 deletions(-)
--

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

[rdale]

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

Branch: refs/heads/tp33
Commit: 153a01b0211df67fd11558fecfd9448b01eb3439
Parents: c7ece36 f64afe5
Author: Robert Dale 
Authored: Sun May 6 10:50:29 2018 -0400
Committer: Robert Dale 
Committed: Sun May 6 10:50:29 2018 -0400

--
 docs/src/reference/the-traversal.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/153a01b0/docs/src/reference/the-traversal.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: c7ece36ec4b9678f8d7372bf6ac3f3d68e6072a6
Parents: 8275e45 e9ab93a
Author: Daniel Kuppitz 
Authored: Wed May 2 09:39:13 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed May 2 09:39:13 2018 -0700

--
 bin/validate-distribution.sh | 26 +-
 1 file changed, 21 insertions(+), 5 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: edaabb44125c14c466c6fdf06f7374382d6509e2
Parents: e1cffe3 789e575
Author: Stephen Mallette 
Authored: Wed Apr 25 18:40:06 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 18:40:06 2018 -0400

--
 .../process/traversal/TraversalStrategies.java  | 41 +---
 1 file changed, 19 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/edaabb44/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
index 8e24a82,091687a..31738b0
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
@@@ -284,6 -283,4 +283,4 @@@ public interface TraversalStrategies ex
  }
  }
  }
- 
- 
 -}
 +}

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

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

Branch: refs/heads/tp33
Commit: e1cffe3df32e3c14beb68e9d741696ccd7c45404
Parents: ecc4a58 6096a4c
Author: Stephen Mallette 
Authored: Wed Apr 25 15:23:24 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 15:23:24 2018 -0400

--
 .../src/reference/gremlin-applications.asciidoc | 70 
 1 file changed, 70 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1cffe3d/docs/src/reference/gremlin-applications.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: ad256743b978f6fb0fbff470b04a9c3a8b0d6ff8
Parents: cfac569 1d9e6dc
Author: Stephen Mallette 
Authored: Wed Apr 25 09:18:38 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 25 09:18:38 2018 -0400

--
 .../process/traversal/TraversalStrategies.java  | 39 ++--
 1 file changed, 20 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ad256743/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalStrategies.java
--

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

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

Branch: refs/heads/tp33
Commit: 8005cb3eecffe2ff64e06e669784564641c3e64d
Parents: ffaca89 8462f85
Author: Stephen Mallette 
Authored: Tue Apr 24 09:20:51 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Apr 24 09:20:51 2018 -0400

--
 gremlin-python/src/main/jython/radish/feature_steps.py | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8005cb3e/gremlin-python/src/main/jython/radish/feature_steps.py
--

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

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

Branch: refs/heads/tp33
Commit: ead56590a6374d5757b53a5412bef47b87c1e4b2
Parents: 9a58689 268423d
Author: Stephen Mallette 
Authored: Mon Apr 23 13:50:29 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 23 13:50:29 2018 -0400

--
 .../java/org/apache/tinkerpop/gremlin/server/GraphManager.java   | 4 ++--
 .../tinkerpop/gremlin/server/util/DefaultGraphManager.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: 81add608549846e5f45e4e1a504e5e3cea6e03f9
Parents: 7e6e985 682f298
Author: Stephen Mallette 
Authored: Fri Apr 20 19:29:17 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:29:17 2018 -0400

--

--

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

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

Branch: refs/heads/tp33
Commit: cf6f9746e3427f6c9cbc5c48d1153b2b523f5880
Parents: 0c9afb6 35bf95a
Author: Stephen Mallette 
Authored: Wed Apr 11 09:14:00 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 11 09:14:00 2018 -0400

--
 docs/src/recipes/collections.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/tp33
Commit: 0c9afb614bd79bc48d02cf63f94e8942c8a577e1
Parents: 0f08514 e1a69fd
Author: Stephen Mallette 
Authored: Wed Apr 11 09:05:46 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 11 09:05:46 2018 -0400

--

--

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

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

Branch: refs/heads/tp33
Commit: 0f085146135b109a70821da699ca502c52fb375c
Parents: aa40dfa da05f94
Author: Stephen Mallette 
Authored: Wed Apr 11 08:57:02 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Apr 11 08:57:02 2018 -0400

--
 docs/src/recipes/collections.asciidoc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: aa40dfa6e4240917e67077e315833ecedfde7e0b
Parents: 46be135 42bacaf
Author: Daniel Kuppitz 
Authored: Mon Apr 9 11:32:52 2018 -0700
Committer: Daniel Kuppitz 
Committed: Mon Apr 9 11:32:52 2018 -0700

--
 docs/src/reference/the-traversal.asciidoc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa40dfa6/docs/src/reference/the-traversal.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: 39c3365e63a6d2fb39ea958aa89b80e77885d2cf
Parents: 76565c3 1592c4f
Author: Stephen Mallette 
Authored: Fri Apr 6 21:19:04 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 6 21:19:04 2018 -0400

--
 gremlin-dotnet/glv/Gremlin.Net.csproj.template   | 4 ++--
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj| 8 
 .../src/main/javascript/gremlin-javascript/package.json  | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/39c3365e/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index cb3587a,fc75b83..1a6bdad
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@@ -25,9 -25,9 +25,9 @@@ limitations under the License

  

- 3.3.2
- 3.3.2.0
 -3.2.9-SNAPSHOT
 -3.2.9.0
 -3.2.0.0
++3.3.3-SNAPSHOT
++3.3.3.0
 +3.3.0.0
  Gremlin.Net
  Apache TinkerPop
  Gremlin.Net for Apache TinkerPop™ is a language variant 
and driver for .NET.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/39c3365e/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
--
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index ced9f58,d20be6a..004f307
--- 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",
-   "version": "3.3.2",
 -  "version": "3.2.9-alpha1",
++  "version": "3.3.3-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [

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

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

Branch: refs/heads/tp33
Commit: eb3517753ece2f188afec1c4b20056374b8f73f7
Parents: 58691c6 8a76583
Author: Daniel Kuppitz 
Authored: Thu Mar 22 10:19:33 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 22 10:19:33 2018 -0700

--

--

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

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

Branch: refs/heads/tp33
Commit: 58691c684f29707699e0111f52d38bc8cbfedc48
Parents: da8588b 373eba1
Author: Stephen Mallette 
Authored: Thu Mar 22 09:13:23 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 22 09:13:23 2018 -0400

--
 .../tinkerpop/gremlin/process/computer/GraphComputerTest.java  | 2 +-
 .../tinkerpop/gremlin/tinkergraph/structure/TinkerFactory.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58691c68/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
--

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

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

Branch: refs/heads/tp33
Commit: 177aeac9da095fe96e3b13f77f27898d291612b3
Parents: 0f29e7e 827b76e
Author: Stephen Mallette 
Authored: Wed Mar 21 09:14:06 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Mar 21 09:14:06 2018 -0400

--
 docs/src/reference/the-graph.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/177aeac9/docs/src/reference/the-graph.asciidoc
--

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

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

Branch: refs/heads/tp33
Commit: 38bcdb6c5abd81e203b7136f68aec043403bd3d3
Parents: 4d13ab1 10d9095
Author: Stephen Mallette 
Authored: Tue Mar 20 14:17:37 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 20 14:17:37 2018 -0400

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

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

[rdale]

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

Branch: refs/heads/tp33
Commit: 4d13ab1882c9f248f0f62ddb47a8d0a338875162
Parents: 10dc80a 143a86b
Author: Robert Dale 
Authored: Tue Mar 20 12:31:05 2018 -0400
Committer: Robert Dale 
Committed: Tue Mar 20 12:31:05 2018 -0400

--
 .../tinkerpop/gremlin/jsr223/DefaultScriptCustomizer.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs


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

Branch: refs/heads/tp33
Commit: 94484e278481e0bb7add3400981993118d127fbe
Parents: 764e888 8c87fcf
Author: Stephen Mallette 
Authored: Mon Mar 19 10:55:23 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 10:55:23 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 gremlin-dotnet/glv/P.template   | 17 ++-
 .../src/Gremlin.Net/Process/Traversal/P.cs  | 22 ++--
 .../Gherkin/GherkinTestRunner.cs|  4 +---
 .../Gherkin/IgnoreException.cs  | 10 +++--
 5 files changed, 41 insertions(+), 13 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 2dac7c4,6d38ccc..02bf546
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -38,14 -38,7 +38,12 @@@ namespace Gremlin.Net.IntegrationTest.G
  public class GherkinTestRunner
  {
  private static readonly IDictionary 
IgnoredScenarios =
 -new Dictionary();
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- { 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
- {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
++{ 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported } // TINKERPOP-1866
 +};
  
  private static class Keywords
  {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/94484e27/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 9bcb860,860c11d..9eb3021
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@@ -40,14 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G
  string reasonSuffix = null;
  switch (reason)
  {
 +case IgnoreReason.TraversalTDeserializationNotSupported:
 +reasonSuffix = " as deserialization of g:T on GraphSON3 
is not supported";
 +break;
- case IgnoreReason.PWithinWrapsArgumentsInArray:
- reasonSuffix = " because P.Within() arguments are 
incorrectly wrapped in an array (TINKERPOP-1920)";
- break;
- case IgnoreReason.PNotDeserializationProblem:
- reasonSuffix = " because P.Not() cannot be deserialized 
by Gremlin Server (TINKERPOP-1922)";
+ case IgnoreReason.NoReason:
+ reasonSuffix = "";
  break;
  }
  return $"Scenario ignored" + reasonSuffix;
@@@ -56,11 -50,6 +53,10 @@@
  
  public enum IgnoreReason
  {
 +/// 
 +/// Deserialization of g:T on GraphSON3 is not supported.
 +/// 
 +TraversalTDeserializationNotSupported,
- PWithinWrapsArgumentsInArray,
- PNotDeserializationProblem
+ NoReason
  }
  }

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-console/src/main/static/NOTICE
gremlin-server/src/main/static/NOTICE


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

Branch: refs/heads/tp33
Commit: 764e888f20e6b366b43b8b180dd05adc38b21663
Parents: ff881c1 3aa7336
Author: Stephen Mallette 
Authored: Mon Mar 19 09:17:03 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Mar 19 09:17:03 2018 -0400

--

--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
data/tinkerpop-sink.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed.json

gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink.json


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

Branch: refs/heads/tp33
Commit: 00b5a69f96f3378f93ab8a18226be55f099f569d
Parents: 4a838c0 d3d1ccf
Author: Stephen Mallette 
Authored: Thu Mar 15 18:44:00 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 18:44:00 2018 -0400

--
 data/tinkerpop-sink.json   |   4 ++--
 data/tinkerpop-sink.kryo   | Bin 288 -> 234 bytes
 .../io/graphson/tinkerpop-sink-typed-v1d0.json |   4 ++--
 .../io/graphson/tinkerpop-sink-typed-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v1d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v2d0.json |   4 ++--
 .../structure/io/graphson/tinkerpop-sink-v3d0.json |   4 ++--
 .../structure/io/gryo/tinkerpop-sink-v1d0.kryo | Bin 288 -> 234 bytes
 .../structure/io/gryo/tinkerpop-sink-v3d0.kryo | Bin 288 -> 234 bytes
 .../tinkergraph/structure/TinkerFactory.java   |  11 ---
 10 files changed, 16 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00b5a69f/data/tinkerpop-sink.json
--
diff --cc data/tinkerpop-sink.json
index c0844a3,420e089..7a27853
--- a/data/tinkerpop-sink.json
+++ b/data/tinkerpop-sink.json
@@@ -1,3 -1,3 +1,3 @@@
- 
{"id":{"@type":"g:Int32","@value":2000},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
- 
{"id":{"@type":"g:Int32","@value":2001},"label":"message_passing_test","inE":{"msg_pass_test_edge":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
 
-{"id":2000,"label":"message","inE":{"link":[{"id":5,"outV":2000}]},"outE":{"link":[{"id":4,"inV":2001},{"id":5,"inV":2000}]},"properties":{"name":[{"id":2,"value":"a"}]}}
 
-{"id":2001,"label":"message","inE":{"link":[{"id":4,"outV":2000}]},"properties":{"name":[{"id":3,"value":"b"}]}}
 
-{"id":1000,"label":"loops","inE":{"self":[{"id":1,"outV":1000}]},"outE":{"self":[{"id":1,"inV":1000}]},"properties":{"name":[{"id":0,"value":"loop"}]}}
++{"id":{"@type":"g:Int32","@value":2000},"label":"message","inE":{"link":[{"id":{"@type":"g:Int32","@value":5},"outV":{"@type":"g:Int32","@value":2000}}]},"outE":{"link":[{"id":{"@type":"g:Int32","@value":4},"inV":{"@type":"g:Int32","@value":2001}},{"id":{"@type":"g:Int32","@value":5},"inV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":2},"value":"a"}]}}
++{"id":{"@type":"g:Int32","@value":2001},"label":"message","inE":{"link":[{"id":{"@type":"g:Int32","@value":4},"outV":{"@type":"g:Int32","@value":2000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":3},"value":"b"}]}}
 
+{"id":{"@type":"g:Int32","@value":1000},"label":"loops","inE":{"self":[{"id":{"@type":"g:Int32","@value":1},"outV":{"@type":"g:Int32","@value":1000}}]},"outE":{"self":[{"id":{"@type":"g:Int32","@value":1},"inV":{"@type":"g:Int32","@value":1000}}]},"properties":{"name":[{"id":{"@type":"g:Int64","@value":0},"value":"loop"}]}}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00b5a69f/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
--
diff --cc 
gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
index bc56489,000..2e83384
mode 100644,00..100644
--- 
a/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
+++ 
b/gremlin-test/src/main/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/tinkerpop-sink-typed-v1d0.json
@@@ -1,3 -1,0 +1,3 @@@
- 

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

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

Branch: refs/heads/tp33
Commit: 4274bd5cf7028ab49356243d677ba6b23f4b911b
Parents: 0c6459d 0bf9b2f
Author: Stephen Mallette 
Authored: Thu Mar 15 10:34:49 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 15 10:34:49 2018 -0400

--
 .../Gherkin/GherkinTestRunner.cs  | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4274bd5c/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index f5e6d3f,e15a492..2dac7c4
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -40,23 -40,8 +40,11 @@@ namespace Gremlin.Net.IntegrationTest.G
  private static readonly IDictionary 
IgnoredScenarios =
  new Dictionary
  {
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },   // TINKERPOP-1866
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
 +{ 
"g_V_hasLabelXpersonX_filterXoutEXcreatedXX_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported }, // TINKERPOP-1866
  {"g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray},
- {
- 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
- IgnoreReason.PNotDeserializationProblem
- },
- {
- 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
- IgnoreReason.PNotDeserializationProblem
- },
- {
- 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
- IgnoreReason.PNotDeserializationProblem
- }
+ {"g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.PWithinWrapsArgumentsInArray}
  };
  
  private static class Keywords

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

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

Branch: refs/heads/tp33
Commit: f9f3d4fc8a65ddbd73dea51cc692d841e2766852
Parents: 510231a f02f94f
Author: Stephen Mallette 
Authored: Tue Mar 13 08:40:46 2018 -0400
Committer: Stephen Mallette 
Committed: Tue Mar 13 08:40:46 2018 -0400

--
 .../apache/tinkerpop/gremlin/jsr223/JavaTranslator.java   | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9f3d4fc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/JavaTranslator.java
--

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

[rdale]

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

Branch: refs/heads/tp33
Commit: c0078326b9bd8f9c0e5cf435fafa8a0de2764304
Parents: b8a7cb7 97fb12e
Author: Robert Dale 
Authored: Fri Mar 9 07:33:15 2018 -0500
Committer: Robert Dale 
Committed: Fri Mar 9 07:33:15 2018 -0500

--
 docs/src/index.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

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

Branch: refs/heads/tp33
Commit: dd3a54ec394ec1920879276794026c737026f78b
Parents: 812439f 03a96f8
Author: Stephen Mallette 
Authored: Wed Mar 7 15:08:36 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:08:36 2018 -0500

--

--

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

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

Branch: refs/heads/tp33
Commit: 812439f5b1c9f2d00c9132ddc24cbba4c0a051c3
Parents: 98ad2fd f31a890
Author: Stephen Mallette 
Authored: Wed Mar 7 15:05:33 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Mar 7 15:05:33 2018 -0500

--
 .../process/computer/SparkMessengerTest.java| 21 
 1 file changed, 4 insertions(+), 17 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: eb6b1e5474c6cc5933df54f64d73d30d714ec325
Parents: 8757963 2c6c151
Author: Stephen Mallette 
Authored: Mon Mar 5 14:23:08 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 14:23:08 2018 -0500

--
 .../traversal/step/util/BulkSetTest.java|  92 
 .../traversal/util/TraversalHelperTest.java | 424 +++
 .../gremlin/process/util/BulkSetTest.java   |  92 
 .../process/util/TraversalHelperTest.java   | 424 ---
 4 files changed, 516 insertions(+), 516 deletions(-)
--

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

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

Branch: refs/heads/tp33
Commit: 920a3d96e80531bfc3f252a3fca47c509c663a25
Parents: 27cc574 81e6ba6
Author: Stephen Mallette 
Authored: Mon Mar 5 07:01:51 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Mar 5 07:01:51 2018 -0500

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/920a3d96/pom.xml
--

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

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

Branch: refs/heads/tp33
Commit: 31762f7c411c44d38249c635e0e39c9345e34264
Parents: 07df6b3 4db0991
Author: Stephen Mallette 
Authored: Fri Mar 2 15:02:13 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Mar 2 15:02:13 2018 -0500

--
 .../driver/ser/GraphSONMessageSerializerGremlinV2d0Test.java| 1 -
 1 file changed, 1 deletion(-)
--

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

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

Branch: refs/heads/tp33
Commit: e56823b673262ba05267785aa82b45e893a77557
Parents: 92e899f a61dd58
Author: Stephen Mallette 
Authored: Thu Mar 1 13:45:47 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 13:45:47 2018 -0500

--
 .../tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e56823b6/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/structure/io/ToyGraphInputRDD.java
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
gremlin-python/src/main/jython/radish/feature_steps.py


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

Branch: refs/heads/tp33
Commit: 92e899f4ceb6c5aa7e614087bca633d46f2fa61d
Parents: 9eed217 2350cbe
Author: Stephen Mallette 
Authored: Thu Mar 1 12:52:27 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 12:52:27 2018 -0500

--
 CHANGELOG.asciidoc   |  1 +
 .../gremlin/structure/io/graphson/GraphSONTokens.java|  1 +
 .../structure/io/graphson/TraversalSerializersV2d0.java  |  2 ++
 .../structure/io/graphson/TraversalSerializersV3d0.java  |  2 ++
 .../ser/GraphSONMessageSerializerGremlinV2d0Test.java| 11 +++
 .../driver/ser/GraphSONMessageSerializerV3d0Test.java| 11 +++
 .../gremlin-javascript/test/cucumber/feature-steps.js|  4 
 gremlin-python/src/main/jython/radish/feature_steps.py   |  5 -
 8 files changed, 28 insertions(+), 9 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/92e899f4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTokens.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/92e899f4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
--
diff --cc 
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
index c629b3f,000..fd11f25
mode 100644,00..100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/TraversalSerializersV3d0.java
@@@ -1,472 -1,0 +1,474 @@@
 +/*
 + *  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.commons.configuration.ConfigurationConverter;
 +import org.apache.commons.configuration.MapConfiguration;
 +import 
org.apache.tinkerpop.gremlin.process.remote.traversal.DefaultRemoteTraverser;
 +import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
 +import org.apache.tinkerpop.gremlin.process.traversal.P;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 +import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
 +import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.TraversalStrategyProxy;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
 +import org.apache.tinkerpop.gremlin.process.traversal.util.OrP;
 +import org.apache.tinkerpop.gremlin.util.function.Lambda;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonGenerator;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonParser;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonProcessingException;
 +import org.apache.tinkerpop.shaded.jackson.core.JsonToken;
 +import org.apache.tinkerpop.shaded.jackson.databind.DeserializationContext;
 +import org.apache.tinkerpop.shaded.jackson.databind.JavaType;
 +import org.apache.tinkerpop.shaded.jackson.databind.SerializerProvider;
 +import org.apache.tinkerpop.shaded.jackson.databind.deser.std.StdDeserializer;
 +import org.apache.tinkerpop.shaded.jackson.databind.jsontype.TypeSerializer;
 +import 

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

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

Branch: refs/heads/tp33
Commit: 9eed217fb50e82fc09e17462e0fe1fd655177384
Parents: 532a5de aaf5146
Author: Daniel Kuppitz 
Authored: Thu Mar 1 09:18:15 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu Mar 1 09:18:15 2018 -0700

--
 docs/preprocessor/preprocess-file.sh | 3 +++
 1 file changed, 3 insertions(+)
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:

gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs


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

Branch: refs/heads/tp33
Commit: b516a6a571e3a1891af4f4245d42ac408638329f
Parents: e1d7f80 6cfdfa9
Author: Stephen Mallette 
Authored: Thu Mar 1 08:37:53 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Mar 1 08:37:53 2018 -0500

--
 .../test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs  | 2 --
 gremlin-test/features/map/Match.feature| 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b516a6a5/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --cc 
gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 5f331cb,627570c..bb97867
--- 
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ 
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@@ -37,32 -37,26 +37,30 @@@ namespace Gremlin.Net.IntegrationTest.G
  {
  public class GherkinTestRunner
  {
 -private static readonly IDictionary 
IgnoredScenarios = new Dictionary {
 -{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_VX1X_out_aggregateXxX_out_whereXnotXwithinXaXXX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_out_asXbX_whereXandXasXaX_outXknowsX_asXbX__orXasXbX_outXcreatedX_hasXname_rippleX__asXbX_inXknowsX_count_isXnotXeqX0X_selectXa_bX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXd_selectXa_b_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_whereXa_gtXbX_orXeqXbXXX_byXageX_byXweightX_byXweightX_selectXa_cX_byXnameX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_asXaX_outEXcreatedX_asXbX_inV_asXcX_inXcreatedX_asXdX_whereXa_ltXbX_orXgtXcXX_andXneqXdXXX_byXageX_byXweightX_byXinXcreatedX_valuesXageX_minX_selectXa_c_dX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_withBulkXfalseX_withSackX1_sumX_VX1X_localXoutEXknowsX_barrierXnormSackX_inVX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_withBulkXfalseX_withSackX1_sumX_V_out_barrier_sack", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_withSackX1_sumX_VX1X_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_hasXageX_groupCountXaX_byXnameX_out_capXaX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasXname_markoX_propertyXfriendWeight_outEXknowsX_weight_sum__acl_privateX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_outE_weight_groupCount_unfold_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_outE_weight_groupCount_selectXkeysX_unfold", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_asXaX_out_asXbX_matchXa_out_count_c__b_in_count_cX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_foo_injectX99X_min", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX",
 IgnoreReason.NeedsFurtherInvestigation },
 -{ "g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX", 
IgnoreReason.NeedsFurtherInvestigation },
 -{ 
"g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX",
 IgnoreReason.NeedsFurtherInvestigation }
 -};
 +private static readonly IDictionary 
IgnoredScenarios =
 +new Dictionary
 +{
 +{ "g_V_valueMapXtrueX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ "g_V_valueMapXtrue_name_ageX", 
IgnoreReason.TraversalTDeserializationNotSupported },
 +{ 
"g_V_hasLabelXpersonX_hasXage_notXlteX10X_andXnotXbetweenX11_20_andXltX29X_orXeqX35_name",
 IgnoreReason.NeedsFurtherInvestigation },
- { "g_V_hasIdXwithinXemptyXX_count", 
IgnoreReason.NeedsFurtherInvestigation },
 +   

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

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

Branch: refs/heads/tp33
Commit: 032124a504c3d324708d96c1d4b52e8ed2b22346
Parents: 69a355f 3aa9e70
Author: Stephen Mallette 
Authored: Wed Feb 28 14:15:22 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 28 14:15:22 2018 -0500

--
 docs/src/index.asciidoc |   3 +
 .../tutorials/gremlins-anatomy/index.asciidoc   | 189 +++
 docs/static/images/gremlin-anatomy-filter.png   | Bin 0 -> 168854 bytes
 docs/static/images/gremlin-anatomy-group.png| Bin 0 -> 62410 bytes
 docs/static/images/gremlin-anatomy-navigate.png | Bin 0 -> 60514 bytes
 docs/static/images/gremlin-anatomy.png  | Bin 0 -> 87212 bytes
 pom.xml |  23 +++
 7 files changed, 215 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/032124a5/pom.xml
--

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

[spmallette]

Merge branch 'tp32' into tp33

Conflicts:
docs/src/dev/developer/for-committers.asciidoc


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

Branch: refs/heads/tp33
Commit: 69a355f85cda60dd3c2fbaeb4b0608506d3945d8
Parents: 614c346 1a857da
Author: Stephen Mallette 
Authored: Tue Feb 27 08:52:16 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 27 08:52:16 2018 -0500

--
 docs/src/dev/developer/for-committers.asciidoc | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/69a355f8/docs/src/dev/developer/for-committers.asciidoc
--