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

2018-02-15 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4772d7d02a213acc7c7da98666938524d8c4f6e2
Parents: 369dfa5 bcffaad
Author: Stephen Mallette 
Authored: Thu Feb 15 09:46:52 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Feb 15 09:46:52 2018 -0500

--

--

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

2018-02-15 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 369dfa5a466d86bf91cc0daa1f9d5a607d0c34a4
Parents: 041bb3f d63aaa8
Author: Stephen Mallette 
Authored: Thu Feb 15 09:45:37 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Feb 15 09:45:37 2018 -0500

--
 docs/src/recipes/centrality.asciidoc | 14 ++
 1 file changed, 14 insertions(+)
--

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

2018-02-14 Thread florianhockmann 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 041bb3fe4bcae2724b9fbbbafc6c21c6c632a2e4
Parents: 764615f 7f39b18
Author: Florian Hockmann 
Authored: Wed Feb 14 20:31:45 2018 +0100
Committer: Florian Hockmann 
Committed: Wed Feb 14 20:31:45 2018 +0100

--
 gremlin-dotnet/glv/Gremlin.Net.csproj.template  | 28 +---
 .../src/Gremlin.Net/Gremlin.Net.csproj  | 28 +---
 2 files changed, 24 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/041bb3fe/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--
diff --cc gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 873667a,a538b8b..397b6a6
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@@ -25,30 -25,26 +25,26 @@@ limitations under the License

  

 -3.2.8-SNAPSHOT
 -3.2.8.0
 -3.2.0.0
 +3.3.2-SNAPSHOT
 +3.3.2.0
 +3.3.0.0
  Gremlin.Net
  Apache TinkerPop
- 
-   Gremlin.Net for Apache TinkerPop™ is a language variant and driver 
for .NET.
- 
- 
-   Apache TinkerPop™ is a graph computing framework for both graph 
databases (OLTP) and graph analytic systems (OLAP).
-   Gremlin is the graph traversal language of TinkerPop. It can be 
described as a functional, data-flow language
-   that enables users to succinctly express complex traversals on (or 
queries of) their application’s property graph.
+ Gremlin.Net for Apache TinkerPop™ is a language variant 
and driver for .NET.
  
-   Gremlin.Net implements Gremlin within .NET. C# syntax has the same 
constructs as Java including “dot notation”
-   for function chaining (a.b.c), round bracket function arguments 
(a(b,c))`, and support for global namespaces
-   (a(b()) vs a(__.b()))`. As such, anyone familiar with Gremlin-Java will 
immediately be able to work with
-   Gremlin.Net. Moreover, there are a few added constructs to Gremlin.Net 
that make traversals a bit more succinct.
+ Apache TinkerPop™ is a graph computing framework for both graph databases 
(OLTP) and graph analytic systems (OLAP).
+ Gremlin is the graph traversal language of TinkerPop. It can be described as 
a functional, data-flow language
+ that enables users to succinctly express complex traversals on (or queries 
of) their application’s property graph.
  
-   Please see the reference documentation at Apache TinkerPop for more 
information on usage.
+ Gremlin.Net implements Gremlin within .NET. C# syntax has the same constructs 
as Java including “dot notation”
+ for function chaining (a.b.c), round bracket function arguments (a(b,c))`, 
and support for global namespaces
+ (a(b()) vs a(__.b()))`. As such, anyone familiar with Gremlin-Java will 
immediately be able to work with
+ Gremlin.Net. Moreover, there are a few added constructs to Gremlin.Net that 
make traversals a bit more succinct.
  
-   NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian 
Hockmann (versions = 0.X) and is now
-   included as part of the Apache TinkerPop project. The 'old' Gremlin.Net 
driver is however still supported.
-   Head to https://github.com/FlorianHockmann/Gremlin.Net for more 
information.
- 
+ Please see the reference documentation at Apache TinkerPop for more 
information on usage.
+ 
+ NOTE: Gremlin.Net is an extension of the Gremlin.Net driver by Florian 
Hockmann (versions: 0.y.z) and is now
+ included as part of the Apache TinkerPop project.
  
../../build/tinkerpop.snk
  true
  true

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

2018-02-14 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 764615fbf3bbeb1d65b3bb6d91c95ca20cd71737
Parents: 5768bc1 2d7113a
Author: Stephen Mallette 
Authored: Wed Feb 14 10:08:45 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Feb 14 10:08:45 2018 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../gremlin/process/traversal/dsl/GremlinDslProcessor.java | 6 ++
 2 files changed, 7 insertions(+)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/764615fb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--

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

2018-02-13 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 609840589df85097ec077f271d297b87816336b8
Parents: 91f6245 395cdef
Author: Stephen Mallette 
Authored: Tue Feb 13 10:56:08 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Feb 13 10:56:08 2018 -0500

--
 .../src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/60984058/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
--

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

2018-02-12 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 91f6245fd47034c09ef06c2f0db41df0b6f5547f
Parents: 5e1c878 8e0470a
Author: Stephen Mallette 
Authored: Mon Feb 12 12:39:59 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Feb 12 12:39:59 2018 -0500

--

--

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

2018-02-12 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: eefc4503184b55357a94bc8d8268160bae073d86
Parents: 5529e18 56245ce
Author: Stephen Mallette 
Authored: Mon Feb 12 12:20:06 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Feb 12 12:20:06 2018 -0500

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


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

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

2018-02-09 Thread spmallette 
Merge branch 'tp32'

Conflicts:
CHANGELOG.asciidoc


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

Branch: refs/heads/master
Commit: 8c079598ee9cbd67b67af8296ff7920691ce28dc
Parents: 304a7ae 97947c1
Author: Stephen Mallette 
Authored: Fri Feb 9 14:29:28 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Feb 9 14:29:28 2018 -0500

--
 CHANGELOG.asciidoc   | 3 ++-
 .../driver/ser/AbstractGraphSONMessageSerializerV2d0.java| 8 
 .../driver/ser/AbstractGryoMessageSerializerV1d0.java| 8 
 3 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8c079598/CHANGELOG.asciidoc
--
diff --cc CHANGELOG.asciidoc
index 1ba3aa8,9dcb7f0..e60186d
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -16,255 -16,6 +16,255 @@@ limitations under the License
  
  = TinkerPop3 CHANGELOG
  
 +== TinkerPop 3.3.0 (Gremlin Symphony #40 in G Minor)
 +
 
+image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-mozart.png[width=185]
 +
 +[[release-3-3-2]]
 +=== TinkerPop 3.3.2 (Release Date: NOT OFFICIALLY RELEASED YET)
-  
++
 +This release also includes changes from <>.
 +
 +* Fixed regression issue where the HTTPChannelizer doesn't instantiate the 
specified AuthenticationHandler
 +* Defaulted GLV tests for gremlin-python to run for GraphSON 3.0.
 +* In gremlin-python, the GraphSON 3.0 `g:Set` type is now deserialized to 
`List`.
 +
 +[[release-3-3-1]]
 +=== TinkerPop 3.3.1 (Release Date: December 17, 2017)
 +
 +This release also includes changes from <>.
 +
 +* Added `NoneStep` and `Traversal.none()` for full filtering integration with 
`iterate()`.
 +* Fixed bug in serialization of `Path` for GraphSON 3.0 in `gremlin-python`.
 +* Added support for GraphSON 3.0 in Gremlin.Net.
 +* Added `math()`-step which supports scientific calculator capabilities for 
numbers within a traversal.
 +* Added missing `GraphTraversalSource.addE()`-method to `GremlinDslProcessor`.
 +* Changed `to()` and `from()` traversal-based steps to take a wildcard `?` 
instead of of `E`.
 +* Added `addV(traversal)` and `addE(traversal)` so that created element 
labels can be determined dynamically.
 +* `PageRankVertexProgram` supports `maxIterations` but will break out early 
if epsilon-based convergence occurs.
 +* Added support for epsilon-based convergence in `PageRankVertexProgram`.
 +* Fixed two major bugs in how PageRank was being calculated in 
`PageRankVertexProgram`.
 +* Added `Io.requiresVersion(Object)` to allow graph providers a way to check 
the `Io` type and version being constructed.
 +* Defaulted `IoCore.gryo()` and `IoCore.graphson()` to both use their 3.0 
formats which means that `Graph.io()` will use those by default.
 +* Bumped Neo4j 3.2.3
 +
 + Bugs
 +
 +* TINKERPOP-1773 Lop should be created as a "software" and not a "person"
 +* TINKERPOP-1783 PageRank gives incorrect results for graphs with sinks 
*(breaking)*
 +* TINKERPOP-1799 Failure to serialize path() in gremlin-python
 +* TINKERPOP-1847 tinkergraph-gremlin dependency on gremlin-test, bad scope?
 +
 + Improvements
 +
 +* TINKERPOP-1632 Create a set of default functions
 +* TINKERPOP-1692 Bump to Neo4j 3.2.3
 +* TINKERPOP-1717 Update name and link of DynamoDB storage backend in landing 
page
 +* TINKERPOP-1730 Gremlin .NET support for GraphSON 3.0
 +* TINKERPOP-1767 Method for graph providers to check an IO version and type
 +* TINKERPOP-1793 addE() should allow dynamic edge labels
 +* TINKERPOP-1834 Consider iterate() as a first class step
 +
 +[[release-3-3-0]]
 +=== TinkerPop 3.3.0 (Release Date: August 21, 2017)
 +
 +This release also includes changes from <>.
 +
 +* Removed previously deprecated `ScriptElementFactory`.
 +* Added `GraphTraversalSource.addE(String)` in support of 
`g.addE().from().to()`.
 +* Added support for `to(Vertex)` and `from(Vertex)` as a shorthand for 
`to(V(a))` and `from(V(b))`.
 +* Bumped to support Spark 2.2.0.
 +* Detected if type checking was required in `GremlinGroovyScriptEngine` and 
disabled related infrastructure if not.
 +* Removed previously deprecated `GraphTraversal.selectV3d0()` step.
 +* Removed previously deprecated `DetachedEdge(Object,String,Map,Pair,Pair)` 
constructor.
 +* Removed previously deprecated `Bindings` constructor. It is now a private 
constructor.
 +* Removed previously deprecated

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

2018-02-05 Thread spmallette 
Merge branch 'tp32'

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


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

Branch: refs/heads/master
Commit: ebaad41ed1511bfff3cb831692732fc2307b7007
Parents: 8e62fd7 9a7a998
Author: Stephen Mallette 
Authored: Mon Feb 5 07:55:49 2018 -0500
Committer: Stephen Mallette 
Committed: Mon Feb 5 07:55:49 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ebaad41e/docs/src/reference/the-traversal.asciidoc
--
diff --cc docs/src/reference/the-traversal.asciidoc
index 9ffd953,2433597..303e38f
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@@ -219,8 -213,7 +219,8 @@@ supports user provided ids
  
  *Additional References*
  
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-java.lang.String-[`addE(String)`],
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-org.apache.tinkerpop.gremlin.process.traversal.Traversal-[`addE(Traversal)`]
 
-link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-java.lang.String-++[`addE(String)`]
++link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-java.lang.String-++[`addE(String)`],
++link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addE-org.apache.tinkerpop.gremlin.process.traversal.Traversal-++[`addE(Traversal)`]
  
  [[addvertex-step]]
  === AddVertex Step
@@@ -239,9 -232,8 +239,9 @@@ g.V().has('name','nothing').bothE(
  
  *Additional References*
  
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV--[`addV()`],
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-java.lang.String-[`addV(String)`]),
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-org.apache.tinkerpop.gremlin.process.traversal.Traversal-[`addV(Traversal)`]
+ 
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV--++[`addV()`],
 
-link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-java.lang.String-++[`addV(String)`])
++link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-java.lang.String-++[`addV(String)`]),
++link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#addV-org.apache.tinkerpop.gremlin.process.traversal.Traversal-++[`addV(Traversal)`]
  
  [[addproperty-step]]
  === AddProperty Step
@@@ -815,9 -807,8 +815,9 @@@ The list of steps that support `from()`
  
  *Additional References*
  
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#from-java.lang.String-[`from(String)`],
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#from-org.apache.tinkerpop.gremlin.process.traversal.Traversal-[`from(Traversal)`],
- 
link:http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#from-org.apache.tinkerpop.gremlin.structure.Vertex-[`from(Vertex)`]
+ 
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#from-java.lang.String-++[`from(String)`],
 
-link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#from-org.apache.tinkerpop.gremlin.process.traversal.Traversal-++[`from(Traversal)`]

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

2018-02-02 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 8e62fd7ebd4cde8f27457f4b86336c265d5a2310
Parents: 6c38c50 5ce3048
Author: Stephen Mallette 
Authored: Fri Feb 2 20:11:44 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Feb 2 20:11:44 2018 -0500

--

--

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

2018-01-24 Thread rdale 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 5f95ba414d4db5394decd6ad88608d224ef71356
Parents: 4788420 5a37ee4
Author: Robert Dale 
Authored: Wed Jan 24 08:49:16 2018 -0500
Committer: Robert Dale 
Committed: Wed Jan 24 08:49:16 2018 -0500

--
 docs/src/dev/developer/development-environment.asciidoc | 2 +-
 docs/src/reference/gremlin-applications.asciidoc| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


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

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

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

2018-01-24 Thread spmallette 
Merge branch 'tp32'

Conflicts:
docs/src/dev/io/graphson.asciidoc


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

Branch: refs/heads/master
Commit: 4788420bfcb0601f32bf30b3fbe0ac12f910ba03
Parents: 082432d d5b6ebb
Author: Stephen Mallette 
Authored: Wed Jan 24 08:35:14 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Jan 24 08:35:14 2018 -0500

--
 docs/src/dev/io/graphson.asciidoc | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4788420b/docs/src/dev/io/graphson.asciidoc
--
diff --cc docs/src/dev/io/graphson.asciidoc
index 9ab937f,7324cee..d6875a2
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@@ -99,134 -81,21 +99,134 @@@ file.withWriter { writer -
  
result(Arrays.asList(graph.vertices().next())).create()
writer.write(toJson(msg, "Standard Result", "The following 
`ResponseMessage` is a typical example of the typical successful response 
Gremlin Server will return when returning results from a script."))
  
 +}
 +
 +mapper = GraphSONMapper.build().
 +addRegistry(TinkerIoRegistryV2d0.instance()).
 +typeInfo(TypeInfo.PARTIAL_TYPES).
 +
addCustomModule(GraphSONXModuleV2d0.build().create(false)).
 +addCustomModule(new 
org.apache.tinkerpop.gremlin.driver.ser.AbstractGraphSONMessageSerializerV2d0.GremlinServerModule()).
 +version(GraphSONVersion.V2_0).create().createMapper()
 +
 +file = new File("io-output/out-graphson-2d0-partial.txt")
 +file.withWriter { writer ->
 +
 +  writer.write("=== Core\n\n")
 +  writer.write(toJson(File, "Class", "", "v2d0-partial"))
 +  writer.write(toJson(new Date(1481750076295L), "Date", "", "v2d0-partial"))
 +  writer.write(toJson(100.00d, "Double", "", "v2d0-partial"))
 +  writer.write(toJson(100.00f, "Float", "", "v2d0-partial"))
 +  writer.write(toJson(100, "Integer", "", "v2d0-partial"))
 +  writer.write(toJson(100L, "Long", "", "v2d0-partial"))
 +  writer.write(toJson(new java.sql.Timestamp(1481750076295L), "Timestamp", 
"", "v2d0-partial"))
 +  
writer.write(toJson(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786"), 
"UUID", "", "v2d0-partial"))
 +
 +  writer.write("\n")
 +  writer.write("=== Graph Structure\n\n")
 +  writer.write(toJson(graph.edges().next(), "Edge", "", "v2d0-partial"))
 +  writer.write(toJson(g.V().out().out().path().next(), "Path", "", 
"v2d0-partial"))
 +  writer.write(toJson(graph.edges().next().properties().next(), "Property", 
"", "v2d0-partial"))
 +  writer.write(toJson(new 
org.apache.tinkerpop.gremlin.structure.util.star.DirectionalStarGraph(org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.of(graph.vertices().next()),
 Direction.BOTH), "StarGraph", "", "v2d0-partial"))
 +  writer.write(toJson(graph, "TinkerGraph", "`TinkerGraph` has a custom 
serializer that is registered as part of the `TinkerIoRegistry`.", 
"v2d0-partial"))
 +  writer.write(toJson(g.V().out().out().tree().next(), "Tree", "", 
"v2d0-partial"))
 +  writer.write(toJson(graph.vertices().next(), "Vertex", "", "v2d0-partial"))
 +  writer.write(toJson(graph.vertices().next().properties().next(), 
"VertexProperty", "", "v2d0-partial"))
 +
 +  writer.write("\n")
 +  writer.write("=== Graph Process\n\n")
 +  writer.write(toJson(SackFunctions.Barrier.normSack, "Barrier", "", 
"v2d0-partial"))
 +  writer.write(toJson(new Bytecode.Binding("x", 1), "Binding", "A \"Binding\" 
refers to a `Bytecode.Binding`.", "v2d0-partial"))
 +  writer.write(toJson(g.V().hasLabel('person').out().in().tree(), "Bytecode", 
"The following `Bytecode` example represents the traversal of 
`g.V().hasLabel('person').out().in().tree()`. Obviously the serialized 
`Bytecode` would be quite different for the endless variations of commands that 
could be used together in the Gremlin language.", "v2d0-partial"))
 +  writer.write(toJson(VertexProperty.Cardinality.list, "Cardinality", "", 
"v2d0-partial"))
 +  writer.write(toJson(Column.keys, "Column", "", "v2d0-partial"))
 +  writer.write(toJson(Direction.OUT, "Direction", "", "v2d0-partial"))
 +  writer.write(toJson(Operator.sum, "Operator", "", "v2d0-partial"))
 +  writer.write(toJson(Order.incr, "Order", "", "v2d0-partial"))
 +  
writer.write(toJson(org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick.any,
 "Pick", "", "v2d0-partial"))
 +  writer.write(toJson(Pop.all, "Pop", "",

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

2018-01-23 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 47283eaa5e2ee82b6b9fa98ccf5c44659ea246aa
Parents: 374d9d8 a31c3b2
Author: Stephen Mallette 
Authored: Tue Jan 23 08:19:01 2018 -0500
Committer: Stephen Mallette 
Committed: Tue Jan 23 08:19:01 2018 -0500

--

--

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

2018-01-20 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: bd9dd29bb4b303aa99ae0276fe53ab3f27479a8b
Parents: 13a8295 b889ca1
Author: Daniel Kuppitz 
Authored: Sat Jan 20 18:11:36 2018 -0700
Committer: Daniel Kuppitz 
Committed: Sat Jan 20 18:11:36 2018 -0700

--

--

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

2018-01-19 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 5d7bf8447a5be35ffa98a008c3171f474f5c6a60
Parents: cb81094 1f56cb5
Author: Stephen Mallette 
Authored: Fri Jan 19 15:43:13 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Jan 19 15:43:13 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d7bf844/docs/src/dev/io/graphson.asciidoc
--
diff --cc docs/src/dev/io/graphson.asciidoc
index 0ae37fd,b769f61..1fc9b9c
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@@ -81,19 -68,18 +81,19 @@@ file.withWriter { writer -
 add("session", 
UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).create()
writer.write(toJson(msg, "Session Close", "The following `RequestMessage` 
is an example of a request to close a session."))
msg = RequestMessage.build("eval").
 -   add("gremlin", "g.V(x)", "bindings", [x: 1], 
"language", "gremlin-groovy").create()
 +   
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
 +   add("gremlin", "g.V(x)", "bindings", [x: 1], 
"language", "gremlin-groovy").create()
writer.write(toJson(msg, "Sessionless Eval", "The following 
`RequestMessage` is an example of a simple sessionless request for a script 
evaluation with parameters."))
msg = RequestMessage.build("eval").
 +   
overrideRequestId(UUID.fromString("cb682578-9d92-4499-9ebc-5c6aa73c5397")).
 add("gremlin", "social.V(x)", "bindings", [x: 1], 
"language", "gremlin-groovy", "aliases", [g: "social"]).create()
 -  writer.write(toJson(msg, "Sessionless Eval", "The following 
`RequestMessage` is an example of a sessionless request for a script evaluation 
with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
 +  writer.write(toJson(msg, "Sessionless Eval Aliased", "The following 
`RequestMessage` is an example of a sessionless request for a script evaluation 
with an alias that binds the `TraversalSource` of \"g\" to \"social\"."))
  
writer.write("\n")
 -  writer.write("ResponseMessage\n")
 -  writer.write("~~~\n\n")
 +  writer.write("=== ResponseMessage\n\n")
msg = 
ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
  
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.AUTHENTICATE).create()
-   writer.write(toJson(msg, "Authentication Challenge", "When authentication 
is enabled, an initial request to the server will result in an authentication 
challenge. The typical response message will appear as follows, but handling it 
could be different dependending on the SASL implementation (e.g. multiple 
challenges maybe requested in some cases, but no in the default provided by 
Gremlin Server)."))
+   writer.write(toJson(msg, "Authentication Challenge", "When authentication 
is enabled, an initial request to the server will result in an authentication 
challenge. The typical response message will appear as follows, but handling it 
could be different dependending on the SASL implementation (e.g. multiple 
challenges maybe requested in some cases, but not in the default provided by 
Gremlin Server)."))
msg = 
ResponseMessage.build(UUID.fromString("41d2e28a-20a4-4ab0-b379-d810dede3786")).
  
code(org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode.SUCCESS).
  
result(Arrays.asList(graph.vertices().next())).create()

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

2018-01-18 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 3126c44412f515afb185b20f0fb8fc7287808c17
Parents: 19a211b 231bbb6
Author: Stephen Mallette 
Authored: Thu Jan 18 14:04:20 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Jan 18 14:04:20 2018 -0500

--
 gremlin-python/pom.xml | 15 +++
 1 file changed, 3 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3126c444/gremlin-python/pom.xml
--

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

2018-01-18 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 19a211b3344a5ed050a758d153f3832f5af7d716
Parents: d67b2ab b54c974
Author: Stephen Mallette 
Authored: Thu Jan 18 07:11:05 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Jan 18 07:11:05 2018 -0500

--
 gremlin-python/pom.xml | 14 --
 1 file changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/19a211b3/gremlin-python/pom.xml
--

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

2018-01-17 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: d67b2abf756ec30159fd3f329da47875132d8ea3
Parents: 310ad8c 7b37a25
Author: Stephen Mallette 
Authored: Wed Jan 17 16:40:28 2018 -0500
Committer: Stephen Mallette 
Committed: Wed Jan 17 16:40:28 2018 -0500

--
 docs/src/recipes/collections.asciidoc | 47 +-
 1 file changed, 46 insertions(+), 1 deletion(-)
--

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

2018-01-11 Thread spmallette 
Merge branch 'tp32'

Conflicts:

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java


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

Branch: refs/heads/master
Commit: 918d986c0309dbb4a3c9add8d9ad10682c7b82e2
Parents: 2f1a9d0 a94baa0
Author: Stephen Mallette 
Authored: Thu Jan 11 10:26:43 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Jan 11 10:26:43 2018 -0500

--
 CHANGELOG.asciidoc|  1 +
 .../gremlin/structure/SerializationTest.java  | 18 +-
 2 files changed, 10 insertions(+), 9 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/918d986c/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
index 60a42ba,1de30de..4935175
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/structure/SerializationTest.java
@@@ -571,22 -375,22 +571,22 @@@ public class SerializationTest 
  @Test
  @LoadGraphWith(LoadGraphWith.GraphData.MODERN)
  public void shouldSerializeTree() throws Exception {
 -final ObjectMapper mapper = 
graph.io(GraphSONIo.build()).mapper().create().createMapper();
 +final ObjectMapper mapper = 
graph.io(GraphSONIo.build(GraphSONVersion.V1_0)).mapper().version(GraphSONVersion.V1_0).create().createMapper();
  final Tree t = 
g.V(convertToVertexId("marko")).out().properties("name").tree().next();
  final String json = mapper.writeValueAsString(t);
--
++
  final HashMap m = (HashMap) 
mapper.readValue(json, mapTypeReference);
--
++
  // Check Structure
  assertEquals(1, m.size());
  assertTrue(m.containsKey(convertToVertexId("marko").toString()));
--
++
  // Check Structure n+1
  final HashMap branch = (HashMap) 
m.get(convertToVertexId("marko").toString());
  assertEquals(2, branch.size());
  assertTrue(branch.containsKey(GraphSONTokens.KEY));
  assertTrue(branch.containsKey(GraphSONTokens.VALUE));
--
++
  //Check n+1 key (traversed element)
  final HashMap branchKey = (HashMap) branch.get(GraphSONTokens.KEY);
  assertTrue(branchKey.containsKey(GraphSONTokens.ID));
@@@ -599,429 -403,19 +599,429 @@@
  final HashMap>> 
branchKeyProps = (HashMap>>) 
branchKey.get(GraphSONTokens.PROPERTIES);
  assertEquals("marko", 
branchKeyProps.get("name").get(0).get("value"));
  assertEquals(29, branchKeyProps.get("age").get(0).get("value"));
--
++
  //Check n+1 value (traversed element)
  final HashMap branchValue = (HashMap) branch.get(GraphSONTokens.VALUE);
  assertEquals(3, branchValue.size());
  
assertTrue(branchValue.containsKey(convertToVertexId("vadas").toString()));
  
assertTrue(branchValue.containsKey(convertToVertexId("lop").toString()));
  
assertTrue(branchValue.containsKey(convertToVertexId("josh").toString()));
--
++
  // Check that vp[] functioned properly
  final HashMap> branch2 = 
(HashMap>) 
branchValue.get(convertToVertexId("vadas").toString());
  assertTrue(branch2.containsKey(GraphSONTokens.KEY));
  assertTrue(branch2.containsKey(GraphSONTokens.VALUE));
--
++
 +final Map.Entry entry = 
branch2.get(GraphSONTokens.VALUE).entrySet().iterator().next();
 +final HashMap> branch2Prop = 
(HashMap>) entry.getValue();
 +
assertTrue(branch2Prop.get(GraphSONTokens.KEY).containsKey(GraphSONTokens.ID));
 +
assertTrue(branch2Prop.get(GraphSONTokens.KEY).containsKey(GraphSONTokens.VALUE));
 +

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

2018-01-05 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: de3f831df25f938bbb88e2c1ddfc9865e04d6977
Parents: 17da0af fbcb044
Author: Stephen Mallette 
Authored: Fri Jan 5 15:09:28 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Jan 5 15:09:28 2018 -0500

--
 docs/src/reference/the-traversal.asciidoc  | 6 --
 .../gremlin/process/traversal/dsl/graph/GraphTraversal.java| 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)
--


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

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

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

2018-01-05 Thread spmallette 
Merge branch 'tp32'

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

Branch: refs/heads/master
Commit: 17da0afdc9aaf4eb2e02d9b455d465a1c12be9d9
Parents: 11a864d d56862b
Author: Stephen Mallette 
Authored: Fri Jan 5 14:13:11 2018 -0500
Committer: Stephen Mallette 
Committed: Fri Jan 5 14:13:11 2018 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17da0afd/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 6f66f35,df05ead..df944c8
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -865,16 -842,16 +865,16 @@@ can be passed to the `Client` instance 
  |username |The username to submit on requests that require authentication. |""
  |=
  
 -=== Connecting via REST
 +=== Connecting via HTTP
  
  image:gremlin-rexster.png[width=225,float=left] While the default behavior 
for Gremlin Server is to provide a
 -WebSocket-based connection, it can also be configured to support 
link:http://en.wikipedia.org/wiki/Representational_state_transfer[REST].
 -The REST endpoint provides for a communication protocol familiar to most 
developers, with a wide support of
 -programming languages, tools and libraries for accessing it.  As a result, 
REST provides a fast way to get started
 +WebSocket-based connection, it can also be configured to support plain HTTP 
web service.
 +The HTTP endpoint provides for a communication protocol familiar to most 
developers, with a wide support of
 +programming languages, tools and libraries for accessing it.  As a result, 
HTTP provides a fast way to get started
- with Gremlin Server.   It also may represent an easier upgrade path from 
link:http://rexster.tinkerpop.com/[Rexster]
+ with Gremlin Server.   It also may represent an easier upgrade path from 
link:https://github.com/tinkerpop/rexster[Rexster]
  as the API for the endpoint is very similar to Rexster's 
link:https://github.com/tinkerpop/rexster/wiki/Gremlin-Extension[Gremlin 
Extension].
  
 -Gremlin Server provides for a single REST endpoint - a Gremlin evaluator - 
which allows the submission of a Gremlin
 +Gremlin Server provides for a single HTTP endpoint - a Gremlin evaluator - 
which allows the submission of a Gremlin
  script as a request.  For each request, it returns a response containing the 
serialized results of that script.
  To enable this endpoint, Gremlin Server needs to be configured with the 
`HttpChannelizer`, which replaces the default. The `WsAndHttpChannelizer` may 
also be configured to enable both WebSockets and the REST endpoint.
  `WebSocketChannelizer`, in the configuration file:

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

2018-01-04 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: e6d8df7e138ec04c4c4a270e7e419dda5f4db478
Parents: 33a1aba df62481
Author: Stephen Mallette 
Authored: Thu Jan 4 08:38:29 2018 -0500
Committer: Stephen Mallette 
Committed: Thu Jan 4 08:38:29 2018 -0500

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

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

2017-12-31 Thread rdale 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 33a1aba2ead18091a6ca8b77cd6f97392e209107
Parents: 5b51d1b 85592bf
Author: Robert Dale 
Authored: Sun Dec 31 10:20:42 2017 -0500
Committer: Robert Dale 
Committed: Sun Dec 31 10:20:42 2017 -0500

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

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

2017-12-27 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 5b51d1b083e747b364e69bbb491d434f624c9e5b
Parents: 192d7f6 9511dac
Author: Stephen Mallette 
Authored: Wed Dec 27 14:32:37 2017 -0500
Committer: Stephen Mallette 
Committed: Wed Dec 27 14:32:37 2017 -0500

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

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

2017-12-27 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 192d7f685efd15721a8459477eda95b722d48c36
Parents: 8130255 bef9e9b
Author: Stephen Mallette 
Authored: Wed Dec 27 10:01:43 2017 -0500
Committer: Stephen Mallette 
Committed: Wed Dec 27 10:01:43 2017 -0500

--
 docs/src/recipes/collections.asciidoc  |  67 
 docs/src/recipes/edge-move.asciidoc|  57 
 docs/src/recipes/index.asciidoc|   4 ++
 docs/static/images/gremlin-collections.png | Bin 0 -> 48305 bytes
 docs/static/images/gremlin-edge.png| Bin 0 -> 79829 bytes
 5 files changed, 128 insertions(+)
--

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

2017-12-12 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 92a2640b6ae5191144e847696f933b4aa98e99a1
Parents: f5687ee a86097d
Author: Daniel Kuppitz 
Authored: Tue Dec 12 14:08:31 2017 -0700
Committer: Daniel Kuppitz 
Committed: Tue Dec 12 14:08:31 2017 -0700

--
 docs/src/recipes/olap-spark-yarn.asciidoc | 21 +++--
 1 file changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/92a2640b/docs/src/recipes/olap-spark-yarn.asciidoc
--
diff --cc docs/src/recipes/olap-spark-yarn.asciidoc
index 85bfe18,634adeb..429d282
--- a/docs/src/recipes/olap-spark-yarn.asciidoc
+++ b/docs/src/recipes/olap-spark-yarn.asciidoc
@@@ -94,14 -94,14 +94,15 @@@ $ . bin/spark-yarn.s
  
  hadoop = System.getenv('HADOOP_HOME')
  hadoopConfDir = System.getenv('HADOOP_CONF_DIR')
- archivePath = "/tmp/spark-gremlin.zip"
- ['bash', '-c', "rm $archivePath 2>/dev/null; cd ext/spark-gremlin/lib && zip 
$archivePath *.jar"].execute()
+ archive = 'spark-gremlin.zip'
+ archivePath = "/tmp/$archive"
+ ['bash', '-c', "rm -f $archivePath; cd ext/spark-gremlin/lib && zip 
$archivePath *.jar"].execute().waitFor()
  conf = new PropertiesConfiguration('conf/hadoop/hadoop-gryo.properties')
 -conf.setProperty('spark.master', 'yarn-client')
 -conf.setProperty('spark.yarn.dist.archives', "$archivePath")
 -conf.setProperty('spark.yarn.appMasterEnv.CLASSPATH', 
"./$archive/*:$hadoopConfDir")
 -conf.setProperty('spark.executor.extraClassPath', 
"./$archive/*:$hadoopConfDir")
 +conf.setProperty('spark.master', 'yarn')
 +conf.setProperty('spark.submit.deployMode', 'client')
 +conf.setProperty('spark.yarn.archive', "$archivePath")
 +conf.setProperty('spark.yarn.appMasterEnv.CLASSPATH', 
"./__spark_libs__/*:$hadoopConfDir")
 +conf.setProperty('spark.executor.extraClassPath', 
"./__spark_libs__/*:$hadoopConfDir")
  conf.setProperty('spark.driver.extraLibraryPath', 
"$hadoop/lib/native:$hadoop/lib/native/Linux-amd64-64")
  conf.setProperty('spark.executor.extraLibraryPath', 
"$hadoop/lib/native:$hadoop/lib/native/Linux-amd64-64")
  conf.setProperty('gremlin.spark.persistContext', 'true')
@@@ -121,14 -121,13 +122,14 @@@ Explanatio
  ~~~
  
  This recipe does not require running the `bin/hadoop/init-tp-spark.sh` script 
described in the
- 
http://tinkerpop.apache.org/docs/x.y.z/reference/#sparkgraphcomputer[reference 
documentation] and thus is also
+ 
link:http://tinkerpop.apache.org/docs/x.y.z/reference/#sparkgraphcomputer[reference
 documentation] and thus is also
  valid for cluster users without access permissions to do so.
 -Rather, it exploits the `spark.yarn.dist.archives` property, which points to 
an archive with jars on the local file
 +
 +Rather, it exploits the `spark.yarn.archive` property, which points to an 
archive with jars on the local file
  system and is loaded into the various YARN containers. As a result the 
`spark-gremlin.zip` archive becomes available
 -as the directory named `spark-gremlin.zip` in the YARN containers. The 
`spark.executor.extraClassPath` and
 -`spark.yarn.appMasterEnv.CLASSPATH` properties point to the files inside this 
archive.
 -This is why they contain the `./spark-gremlin.zip/*` item. Just because a 
Spark executor got the archive with
 +as the directory named `+__spark_libs__+` in the YARN containers. The 
`spark.executor.extraClassPath` and
 +`spark.yarn.appMasterEnv.CLASSPATH` properties point to the jars inside this 
directory.
 +This is why they contain the `+./__spark_lib__/*+` item. Just because a Spark 
executor got the archive with
  jars loaded into its container, does not mean it knows how to access them.
  
  Also the `HADOOP_GREMLIN_LIBS` mechanism is not used because it can not work 
for Spark on YARN as implemented (jars
@@@ -152,7 -151,7 +153,7 @@@ as long as you do not use the `spark-su
  runtime dependencies listed in the `Gremlin-Plugin-Dependencies` section of 
the manifest file in the `spark-gremlin`
  jar.
  
 -You may not like the idea that the Hadoop and Spark jars from the TinkerPop 
distribution differ from the versions in
 +You may not like the idea that the Hadoop and Spark jars from the Tinkerpop 
distribution differ from the versions in
  your cluster. If so, just build TinkerPop from source with the corresponding 
dependencies changed in the various `pom.xml`
 -files (e.g. `spark-core_2.10-1.6.1-some-vendor.jar` instead of 
`spark-core_2.10-1.6.1.jar`). Of course, TinkerPop will
 +files (e.g.

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

2017-12-11 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: f5687ee4497bfbaef4ae89233e4c29f07001ed2c
Parents: 1e7b33c fb64051
Author: Daniel Kuppitz 
Authored: Mon Dec 11 13:34:26 2017 -0700
Committer: Daniel Kuppitz 
Committed: Mon Dec 11 13:34:26 2017 -0700

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

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

2017-12-11 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 6203e221dbe7412c813a27f4e5ba911c0c0abb84
Parents: 09fb4be 97bb97f
Author: Stephen Mallette 
Authored: Mon Dec 11 10:34:25 2017 -0500
Committer: Stephen Mallette 
Committed: Mon Dec 11 10:34:25 2017 -0500

--
 docs/preprocessor/awk/init-code-blocks.awk |  2 +-
 gremlin-python/pom.xml | 32 +++--
 2 files changed, 4 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6203e221/docs/preprocessor/awk/init-code-blocks.awk
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6203e221/gremlin-python/pom.xml
--

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

2017-11-22 Thread spmallette 
Merge branch 'tp32'

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


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

Branch: refs/heads/master
Commit: 7463b3ae3b273d11683bd698705c877ccca34227
Parents: 6a663fe 691ee9b
Author: Stephen Mallette 
Authored: Wed Nov 22 14:15:44 2017 -0500
Committer: Stephen Mallette 
Committed: Wed Nov 22 14:15:44 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7463b3ae/gremlin-python/src/main/jython/radish/terrain.py
--

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

2017-11-22 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 65259d2eac237e1e5ea00f24e60979a2c2fb2a3a
Parents: 30e5c95 0f27197
Author: Stephen Mallette 
Authored: Wed Nov 22 07:47:52 2017 -0500
Committer: Stephen Mallette 
Committed: Wed Nov 22 07:47:52 2017 -0500

--

--

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

2017-11-21 Thread rdale 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 875e6657111b6da6983c1bd329e8e6e88d21fc77
Parents: 5e903c1 5a478ae
Author: Robert Dale 
Authored: Tue Nov 21 20:19:35 2017 -0500
Committer: Robert Dale 
Committed: Tue Nov 21 20:19:35 2017 -0500

--
 .../tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java   | 2 +-
 .../tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

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

2017-11-21 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 5e903c11ebb13f7808aec1724d3ece566936eacc
Parents: 26ea2be 2c9bc46
Author: Stephen Mallette 
Authored: Tue Nov 21 15:46:00 2017 -0500
Committer: Stephen Mallette 
Committed: Tue Nov 21 15:46:00 2017 -0500

--
 .../apache/tinkerpop/gremlin/neo4j/MultiMetaNeo4jGraphProvider.java | 1 +
 .../tinkerpop/gremlin/neo4j/NoMultiNoMetaNeo4jGraphProvider.java| 1 +
 2 files changed, 2 insertions(+)
--

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

2017-11-20 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 26ea2bec8e3dbb789ac9608715f5c281b1c440d2
Parents: 499e82d ed9ca81
Author: Stephen Mallette 
Authored: Mon Nov 20 08:39:00 2017 -0500
Committer: Stephen Mallette 
Committed: Mon Nov 20 08:39:00 2017 -0500

--
 neo4j-gremlin/pom.xml | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/26ea2bec/neo4j-gremlin/pom.xml
--

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

2017-11-17 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 499e82d327625be4de57209332c529c8a91411d0
Parents: d6f031f ec1cbda
Author: Stephen Mallette 
Authored: Fri Nov 17 18:48:01 2017 -0500
Committer: Stephen Mallette 
Committed: Fri Nov 17 18:48:01 2017 -0500

--
 CHANGELOG.asciidoc | 1 +
 .../gremlin/structure/util/detached/DetachedEdge.java  | 6 --
 2 files changed, 5 insertions(+), 2 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/499e82d3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/detached/DetachedEdge.java
--

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

2017-11-05 Thread rdale 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 7057d5ffb7418032e3b006feaab74d5ee442d5b0
Parents: 4762e50 e20b8ae
Author: Robert Dale 
Authored: Sun Nov 5 06:23:16 2017 -0500
Committer: Robert Dale 
Committed: Sun Nov 5 06:23:16 2017 -0500

--
 docs/src/dev/developer/contributing.asciidoc|  4 ++--
 .../developer/development-environment.asciidoc  |  2 +-
 docs/src/dev/developer/release.asciidoc |  2 +-
 docs/src/dev/provider/index.asciidoc|  6 +++---
 docs/src/recipes/between-vertices.asciidoc  |  2 +-
 docs/src/recipes/centrality.asciidoc|  2 +-
 docs/src/recipes/connected-components.asciidoc  |  2 +-
 docs/src/recipes/cycle-detection.asciidoc   |  2 +-
 docs/src/recipes/duplicate-edge.asciidoc|  6 +++---
 .../src/recipes/if-then-based-grouping.asciidoc |  2 +-
 docs/src/recipes/pagination.asciidoc|  4 ++--
 docs/src/recipes/recommendation.asciidoc|  6 +++---
 docs/src/recipes/tree.asciidoc  |  4 ++--
 .../src/reference/gremlin-applications.asciidoc | 14 +++---
 docs/src/reference/gremlin-variants.asciidoc|  4 ++--
 docs/src/reference/the-traversal.asciidoc   | 12 ++--
 .../the-gremlin-console/index.asciidoc  |  4 ++--
 .../upgrade/release-3.2.x-incubating.asciidoc   | 20 ++--
 18 files changed, 49 insertions(+), 49 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/dev/developer/release.asciidoc
--
diff --cc docs/src/dev/developer/release.asciidoc
index cbddfe5,d3097ec..6589b6b
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@@ -236,9 -235,13 +236,9 @@@ for generating javadoc and without tha
  . Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.
  . `cd release; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
  . Wait for Apache Sonatype to sync the artifacts to Maven Central at 
(link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]).
- . Report the release through 
link:https://reporter.apache.org/addrelease.html?tinkerpop[reporter.apache.org] 
(an email reminder should arrive shortly follwing the svn command above to do 
the release)
+ . Report the release through 
link:https://reporter.apache.org/addrelease.html?tinkerpop[reporter.apache.org] 
(an email reminder should arrive shortly following the svn command above to do 
the release)
  . Wait for zip distributions to to sync to the Apache mirrors (i.e ensure the 
download links work from a mirror).
 -. Update home page site with references to latest distribution - specifically:
 -.. Update the `template/header-footer.html`.
 -.. Update `index.html`.
 -.. Update link:http://tinkerpop.apache.org/downloads.html[Downloads] page, 
when moving "Current Releases" to "Archived
 -Releases" recall that the hyperlink must change to point to version in the 
link:https://archive.apache.org/dist/tinkerpop/[Apache Archives].
 +. `bin/publish-home.sh ` to publish the updated web site with new 
releases.
  . Execute `bin/update-current-docs.sh` to migrate to the latest documentation 
set for `/current`.
  . This step should only occur after the website is updated and all links are 
working. If there are releases present in
  SVN that represents lines of code that are no longer under development, then 
remove those releases. In other words,

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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7057d5ff/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 598b0f8,6135af9..82dc393
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -1122,9 -1068,8 +1122,9 @@@ The following table describes the vario
  |authentication.authenticator |The fully qualified classname of an 
`Authenticator` implementation to use.  If this setting is not present, then 
authentication is effectively disabled.

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

2017-11-02 Thread rdale 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4762e508acfded143f77fe7df7818d8745f1ebed
Parents: c32fcfe 7fe2ec7
Author: Robert Dale 
Authored: Thu Nov 2 14:27:56 2017 -0400
Committer: Robert Dale 
Committed: Thu Nov 2 14:27:56 2017 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 pom.xml| 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4762e508/pom.xml
--
diff --cc pom.xml
index 7fd4168,94951cc..cc0fcf5
--- a/pom.xml
+++ b/pom.xml
@@@ -145,10 -146,10 +145,10 @@@ limitations under the License
  2.10.4
  1.1
  3.0.2
- 4.0.50.Final
+ 4.0.52.Final
  1.7.21
  1.15
 -1.6.1
 +2.2.0
  
  UTF-8
  
UTF-8

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

2017-11-02 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: c32fcfef768bd8678c9a1764a87698c704542bb7
Parents: b57cf72 4780f29
Author: Stephen Mallette 
Authored: Thu Nov 2 13:32:25 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Nov 2 13:32:25 2017 -0400

--
 gremlin-server/src/main/static/NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2017-11-02 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: b57cf72a6763863859a9c3f2036fae0266e6ec30
Parents: 47b02d2 79685f1
Author: Stephen Mallette 
Authored: Thu Nov 2 13:30:43 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Nov 2 13:30:43 2017 -0400

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

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

2017-10-30 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 2e4f8bf7c3a1c9e39729ab5aab4886f1f469d641
Parents: b6ae5b0 909cd91
Author: Stephen Mallette 
Authored: Mon Oct 30 08:36:14 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Oct 30 08:36:14 2017 -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/2e4f8bf7/docs/src/reference/the-traversal.asciidoc
--

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

2017-10-30 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: b6ae5b00fd21d5014e2d297f032c46a105e6c486
Parents: c7f4a53 9a15262
Author: Stephen Mallette 
Authored: Mon Oct 30 06:59:59 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Oct 30 06:59:59 2017 -0400

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

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

2017-10-27 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: c7f4a534d401abdb2afea0cf0b2bd3418c492d57
Parents: 8b76225 3303ef9
Author: Stephen Mallette 
Authored: Fri Oct 27 14:29:25 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Oct 27 14:29:25 2017 -0400

--
 gremlin-python/pom.xml| 10 ++
 .../python/jsr223/GremlinJythonScriptEngineTest.java  |  2 ++
 .../gremlin/python/jsr223/JythonTranslatorTest.java   |  2 ++
 .../python/jsr223/PythonGremlinScriptEngineTest.java  |  2 ++
 .../gremlin/python/jsr223/PythonProcessComputerTest.java  |  2 ++
 .../gremlin/python/jsr223/PythonProcessStandardTest.java  |  2 ++
 .../python/structure/io/graphson/GraphSONReaderTest.java  |  2 ++
 .../python/structure/io/graphson/GraphSONWriterTest.java  |  2 ++
 8 files changed, 20 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c7f4a534/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
--
diff --cc 
gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
index 92cc07c,40235a7..d1e37b6
--- 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
+++ 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
@@@ -51,48 -50,45 +52,49 @@@ import static org.junit.Assert.assertTr
  /**
   * @author Marko A. Rodriguez (http://markorodriguez.com)
   */
+ @Ignore
  public class GraphSONReaderTest {
  
 -private static final ScriptEngine jythonEngine = 
JythonScriptEngineSetup.setup((PyScriptEngine) new 
ScriptEngineManager().getEngineByName("jython"));
 -private static final ObjectMapper mapper = 
GraphSONMapper.build().version(GraphSONVersion.V2_0).create().createMapper();
 +private static final Set VERSIONS = new 
HashSet<>(Arrays.asList(GraphSONVersion.V2_0, GraphSONVersion.V3_0));
  private static final GraphTraversalSource g = 
TinkerFactory.createModern().traversal();
  
 -
  @Test
  public void shouldDeserializeGraphObjects() throws Exception {
 -final Vertex vertex = g.V(1).next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(vertex));
 -assertEquals(vertex.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),Vertex)"));
 -assertEquals("person", 
jythonEngine.eval("graphson_reader.readObject(x).label"));
 -assertEquals(1, 
jythonEngine.eval("graphson_reader.readObject(x).id"));
 -//
 -final Edge edge = g.V(1).outE("created").next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(edge));
 -assertEquals(edge.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),Edge)"));
 -assertEquals("created", 
jythonEngine.eval("graphson_reader.readObject(x).label"));
 -//
 -final VertexProperty vertexProperty = (VertexProperty) 
g.V(1).properties("name").next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(vertexProperty));
 -assertEquals(vertexProperty.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),VertexProperty)"));
 -//
 -final Property property = 
g.V(1).outE("created").properties("weight").next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(property));
 -assertEquals(property.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),Property)"));
 -//
 -final Traverser traverser = new 
DefaultRemoteTraverser<>(vertex, 3L);
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(traverser));
 -

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

2017-10-27 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 8b76225aa9df5a704461d59e323890ff9fcb0cf4
Parents: de1614b 7d20981
Author: Stephen Mallette 
Authored: Fri Oct 27 08:29:36 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Oct 27 08:29:36 2017 -0400

--
 .../process/traversal/step/map/ProfileTest.java | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8b76225a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProfileTest.java
--

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

2017-10-26 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: de1614bcd08add5a757f6a49d78b0d4f45adcbca
Parents: ecd45d5 0282615
Author: Stephen Mallette 
Authored: Thu Oct 26 11:08:36 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 26 11:08:36 2017 -0400

--
 CHANGELOG.asciidoc|  1 +
 .../tinkerpop/gremlin/console/Mediator.groovy | 18 --
 .../gremlin/console/commands/PluginCommand.groovy | 15 +--
 3 files changed, 22 insertions(+), 12 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/de1614bc/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Mediator.groovy
--

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

2017-10-25 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: d45e053099cda42bec95fc7891b05ea330be85b3
Parents: 1ce7d12 c0a03ca
Author: Stephen Mallette 
Authored: Wed Oct 25 07:57:36 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Oct 25 07:57:36 2017 -0400

--
 CHANGELOG.asciidoc   | 1 +
 .../process/traversal/step/map/LambdaCollectingBarrierStep.java  | 4 
 .../gremlin/process/traversal/step/map/LambdaFlatMapStep.java| 4 
 .../process/traversal/step/sideEffect/LambdaSideEffectStep.java  | 4 
 4 files changed, 13 insertions(+)
--


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

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

2017-10-23 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 1ce7d12463c0bf3b102b12fe397315892cb55b6e
Parents: a8c5f65 f1c41ea
Author: Stephen Mallette 
Authored: Mon Oct 23 13:53:49 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Oct 23 13:53:49 2017 -0400

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


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

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

2017-10-19 Thread okram 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 584be0690fa08dcae3f108df6d8e701174e1db0c
Parents: a11088b 3648f80
Author: Marko A. Rodriguez 
Authored: Thu Oct 19 14:01:28 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Thu Oct 19 14:01:28 2017 -0600

--

--

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

2017-10-16 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 837b60de0e277bcdf640fb33810c866570018793
Parents: 4cab09d c13bf94
Author: Stephen Mallette 
Authored: Mon Oct 16 08:27:46 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Oct 16 08:27:46 2017 -0400

--
 docs/src/dev/provider/index.asciidoc | 103 ++
 docs/src/reference/gremlin-variants.asciidoc |  95 +---
 2 files changed, 105 insertions(+), 93 deletions(-)
--


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

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

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

2017-10-16 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4cab09ddf7b4f7c7c700805702eea305a65e7601
Parents: 18614f5 ea10316
Author: Stephen Mallette 
Authored: Mon Oct 16 07:32:52 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Oct 16 07:32:52 2017 -0400

--
 .../gremlin/process/traversal/step/Scoping.java | 71 
 1 file changed, 71 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4cab09dd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
--

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

2017-10-12 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 99d0814a9d286cbe931236f77364cdad4eb7fa8b
Parents: 3181288 cb7057c
Author: Stephen Mallette 
Authored: Thu Oct 12 13:42:22 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 12 13:42:22 2017 -0400

--
 docs/src/index.asciidoc   |   4 
 docs/static/images/gremlin-compendium.png | Bin 0 -> 212061 bytes
 2 files changed, 4 insertions(+)
--

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

2017-10-04 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: e215401693d21ed34bb823e1aee49fb1f3821f70
Parents: 26d8dd2 b3e301e
Author: Stephen Mallette 
Authored: Wed Oct 4 08:28:14 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Oct 4 08:28:14 2017 -0400

--
 CHANGELOG.asciidoc|  1 +
 .../gremlin/server/op/AbstractEvalOpProcessor.java| 14 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e2154016/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
--

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

2017-10-03 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 9c5a7c80d5645f52f9a6e2a47c28badd8b6ef0e3
Parents: 2ef1fbc 37c4f39
Author: Stephen Mallette 
Authored: Tue Oct 3 13:34:18 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Oct 3 13:34:18 2017 -0400

--
 .../gremlin/process/traversal/step/sideEffect/GroupCountTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2017-10-03 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 24bec105390a4950292f734dd2394abc9f55c78e
Parents: 9c5a7c8 9f501cd
Author: Stephen Mallette 
Authored: Tue Oct 3 13:35:10 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Oct 3 13:35:10 2017 -0400

--

--

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

2017-10-03 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 2ef1fbc8544b987dc55d948b11f59295493d6727
Parents: 4728916 5e39771
Author: Daniel Kuppitz 
Authored: Tue Oct 3 08:18:55 2017 -0700
Committer: Daniel Kuppitz 
Committed: Tue Oct 3 08:18:55 2017 -0700

--
 docker/scripts/build.sh | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2ef1fbc8/docker/scripts/build.sh
--

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

2017-10-02 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 47289160b363289fbd5493c9b14a61912ccc3312
Parents: bacfb0e 7b0bd95
Author: Daniel Kuppitz 
Authored: Mon Oct 2 09:58:18 2017 -0700
Committer: Daniel Kuppitz 
Committed: Mon Oct 2 09:58:18 2017 -0700

--
 docker/hadoop/install.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--

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

2017-09-29 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: bacfb0e32e4fe3291849ac679b2e2ac1ae2c4a4f
Parents: 5e271ea e509b6b
Author: Stephen Mallette 
Authored: Fri Sep 29 13:59:30 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 29 13:59:30 2017 -0400

--
 .../tinkerpop/gremlin/process/traversal/step/map/VertexTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

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

2017-09-29 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 5e271eaf3a877ab20de5713287e274bf860d4e32
Parents: d75940a d223d65
Author: Stephen Mallette 
Authored: Fri Sep 29 12:44:53 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 29 12:44:53 2017 -0400

--
 docs/src/recipes/index.asciidoc | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)
--

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

2017-09-29 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: d75940aaeec7c0c38aa38484d2b1597676e94a94
Parents: 0169a95 0bffe25
Author: Stephen Mallette 
Authored: Fri Sep 29 12:42:01 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 29 12:42:01 2017 -0400

--
 docs/src/recipes/tree.asciidoc | 18 --
 1 file changed, 16 insertions(+), 2 deletions(-)
--

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

2017-09-29 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 0169a95389e539eeab256d0f7e768fd4cdf01fe6
Parents: a15ca39 d028a9c
Author: Stephen Mallette 
Authored: Fri Sep 29 12:24:37 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 29 12:24:37 2017 -0400

--
 docs/src/recipes/duplicate-edge.asciidoc | 22 +++---
 1 file changed, 7 insertions(+), 15 deletions(-)
--

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

2017-09-29 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: a15ca39cac3a2e4d9cfff12b97788fce4fae539b
Parents: 87bf0c6 f858295
Author: Stephen Mallette 
Authored: Fri Sep 29 12:10:50 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 29 12:10:50 2017 -0400

--
 docs/src/recipes/connected-components.asciidoc | 17 -
 1 file changed, 8 insertions(+), 9 deletions(-)
--

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

2017-09-27 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: d47fdffb7ec20398a2cacfb2e7f8efdf7cd243b1
Parents: fa246a1 eb2585b
Author: Stephen Mallette 
Authored: Wed Sep 27 13:37:27 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 27 13:37:27 2017 -0400

--
 .../gremlin/process/traversal/step/map/CountTest.java   | 9 -
 1 file changed, 9 deletions(-)
--

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

2017-09-26 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: fa246a1899b0d2165b43642f7ee0c21fe64ee6d9
Parents: f39d451 05dd743
Author: Daniel Kuppitz 
Authored: Tue Sep 26 10:40:01 2017 -0700
Committer: Daniel Kuppitz 
Committed: Tue Sep 26 10:40:01 2017 -0700

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


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

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

2017-09-26 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 68ff561bb490131f8449cb400345e0451a7f9d25
Parents: affe3e3 40f93dd
Author: Daniel Kuppitz 
Authored: Tue Sep 26 10:19:34 2017 -0700
Committer: Daniel Kuppitz 
Committed: Tue Sep 26 10:19:34 2017 -0700

--
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)
--


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

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

2017-09-21 Thread okram 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 6b337324b8f6f35e726af6d0faba3795f030c23e
Parents: 6278e3b 98ed3d4
Author: Marko A. Rodriguez 
Authored: Thu Sep 21 12:45:49 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Thu Sep 21 12:45:49 2017 -0600

--
 .../gremlin/python/structure/io/graphson/GraphSONReaderTest.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6b337324/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
--
diff --cc 
gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
index 48d2e80,e10d2a6..92cc07c
--- 
a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
+++ 
b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/structure/io/graphson/GraphSONReaderTest.java
@@@ -53,43 -51,42 +53,46 @@@ import static org.junit.Assert.assertTr
   */
  public class GraphSONReaderTest {
  
 -private static final ScriptEngine jythonEngine = 
JythonScriptEngineSetup.setup((PyScriptEngine) new 
ScriptEngineManager().getEngineByName("jython"));
 -private static final ObjectMapper mapper = 
GraphSONMapper.build().version(GraphSONVersion.V2_0).create().createMapper();
 +private static final Set VERSIONS = new 
HashSet<>(Arrays.asList(GraphSONVersion.V2_0, GraphSONVersion.V3_0));
  private static final GraphTraversalSource g = 
TinkerFactory.createModern().traversal();
  
 -
  @Test
  public void shouldDeserializeGraphObjects() throws Exception {
 -final Vertex vertex = g.V(1).next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(vertex));
 -assertEquals(vertex.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),Vertex)"));
 -assertEquals("person", 
jythonEngine.eval("graphson_reader.readObject(x).label"));
 -assertEquals(1, 
jythonEngine.eval("graphson_reader.readObject(x).id"));
 -//
 -final Edge edge = g.V(1).outE("created").next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(edge));
 -assertEquals(edge.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),Edge)"));
 -assertEquals("created", 
jythonEngine.eval("graphson_reader.readObject(x).label"));
 -//
 -final VertexProperty vertexProperty = (VertexProperty) 
g.V(1).properties("name").next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(vertexProperty));
 -assertEquals(vertexProperty.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),VertexProperty)"));
 -//
 -final Property property = 
g.V(1).outE("created").properties("weight").next();
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(property));
 -assertEquals(property.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),Property)"));
 -//
 -final Traverser traverser = new 
DefaultRemoteTraverser<>(vertex, 3L);
 -jythonEngine.getBindings(ScriptContext.ENGINE_SCOPE).put("x", 
mapper.writeValueAsString(traverser));
 -assertEquals(traverser.toString(), 
jythonEngine.eval("str(graphson_reader.readObject(x))"));
 -assertEquals(BigInteger.valueOf(3L), 
jythonEngine.eval("graphson_reader.readObject(x).bulk")); // jython uses big 
integer in Java
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x).object,Vertex)"));
 -assertTrue((Boolean) 
jythonEngine.eval("isinstance(graphson_reader.readObject(x),Traverser)"));
 +for (final GraphSONVersion version : VERSIONS) {
 +final ScriptEngine jythonEngine = 
JythonScriptEngineSetup.setup((PyScriptEngine) new 
ScriptEngineManager().getEngineByName("jython"));
 +jythonEngine.eval("graphson_reader = " +

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

2017-09-21 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 6278e3ba322587ced608ddd56a29aba51612fe2c
Parents: e3e1cbf aaa0f14
Author: Stephen Mallette 
Authored: Thu Sep 21 07:32:59 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 21 07:32:59 2017 -0400

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


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

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

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

2017-09-19 Thread spmallette 
Merge branch 'tp32'

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

Branch: refs/heads/master
Commit: b8d1c0494ca2b7a337b132f7be919dce1e0da81a
Parents: 28e2328 9a69516
Author: Stephen Mallette 
Authored: Tue Sep 19 14:03:21 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Sep 19 14:03:21 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8d1c049/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 26b5fd7,5af699f..a783f64
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -400,6 -384,10 +400,11 @@@ on how to develop a driver for Gremlin 
  By default, communication with Gremlin Server occurs over 
link:http://en.wikipedia.org/wiki/WebSocket[WebSocket] and
  exposes a custom sub-protocol for interacting with the server.
  
+ WARNING: Gremlin Server allows for the execution of remotely submitted 
"scripts" (i.e. arbitrary code sent by a client
+ to the server). Developers should consider the security implications involved 
in running Gremlin Server without the
 -appropriate precautions. Please review the <> for more information.
++appropriate precautions. Please review the <> and 
more specifically, the
++<> for more information.
+ 
  [[starting-gremlin-server]]
  Starting Gremlin Server
  ~~~
@@@ -1245,32 -1200,14 +1250,33 @@@ The `TraversalOpProcessor` provides a w
  |cacheMaxSize |The maximum number of entries in the side-effect cache. |1000
  |=
  
 -Security and Execution
 -^^
++[[security]]
 +Security
 +
  
  image:gremlin-server-secure.png[width=175,float=right] Gremlin Server 
provides for several features that aid in the
 -security of the graphs that it exposes.  It has built in SSL support and a 
pluggable authentication framework using
 +security of the graphs that it exposes.  In particular it supports SSL for 
transport layer security, protective measures against
 +malicious script execution, and authentication.  SSL options are described in 
the configuration settings table in the
 +<> section. Script execution 
options are covered
 +<>. This section starts with 
authentication.
 +
 +
 +Gremlin Server supports a pluggable authentication framework using
  
link:https://en.wikipedia.org/wiki/Simple_Authentication_and_Security_Layer[SASL]
 (Simple Authentication and
 -Security Layer).  SSL options are described in the configuration settings 
table above, so this section will focus on
 -authentication.
 +Security Layer). Depending on the client used to connect to Gremlin Server, 
different authentication
 +mechanisms are accessible, see the table below.
 +
 +[width="70%",cols="3,5,3",options="header"]
 +|=
 +|Client |Authentication mechanism |Availability
 +|HTTP |BASIC |3.0.0-incubating
 +1.3+v|Gremlin-Java/
 +Gremlin-Console |PLAIN SASL (username/password) |3.0.0-incubating
 +|Pluggable SASL |3.0.0-incubating
 +|GSSAPI SASL (Kerberos) |3.3.0
 +|Gremlin-Python |PLAIN SASL |3.2.2
 +|Gremlin-Javascript |PLAIN SASL |3.3.0
 +|=
  
  By default, Gremlin Server is configured to allow all requests to be 
processed (i.e. no authentication).  To enable
  authentication, Gremlin Server must be configured with an `Authenticator` 
implementation in its YAML file.  Gremlin
@@@ -1440,34 -1332,37 +1446,40 @@@ some problems would be, `while(true) {}
  preventing it from serving other requests.  Sending enough of these kinds of 
scripts would eventually consume all
  available threads and Gremlin Server would stop responding.
  
- Gremlin Server (more specifically the `GremlinGroovyScriptEngine`) provides 
methods to protect itself from these
- kinds of troublesome scripts.  A user can configure the script engine with a 
`GroovyCompilerGremlinPlugin`
+ Scripts have access to the full power of their language and the JVM on which 
they are running. This means that they
+ can access certain APIs

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

2017-09-18 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4105bcc3a78d6c93147aaa9b8dcd13b248d275d1
Parents: 36830f4 b2850f3
Author: Stephen Mallette 
Authored: Mon Sep 18 15:37:57 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Sep 18 15:37:57 2017 -0400

--
 docker/scripts/build.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4105bcc3/docker/scripts/build.sh
--
diff --cc docker/scripts/build.sh
index 30544ac,5e6e6cd..36d9edf
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -57,19 -57,15 +57,19 @@@ TINKERPOP_BUILD_OPTIONS="
  [ -z "${BUILD_JAVA_DOCS}" ] && 
TINKERPOP_BUILD_OPTIONS="${TINKERPOP_BUILD_OPTIONS} -Dmaven.javadoc.skip=true"
  
  # If the tmpfs (in-memory filesystem exists, use it)
 -if [ -d "/usr/src/tinkermem" ]; then
 -  echo Copying source to in-memory tmpfs
 -  rsync -a . /usr/src/tinkermem
 -  cd /usr/src/tinkermem
 +TINKERMEM_PATH=$(cd .. ; echo `pwd`/tinkermem)
 +if [ -d "${TINKERMEM_PATH}" ]; then
 +  echo "Moving source to in-memory tmpfs"
 +  rsync --remove-source-files -a . ${TINKERMEM_PATH}
 +  cd ..
 +  rm -rf ${OLDPWD}
 +  ln -s ${TINKERMEM_PATH} ${OLDPWD}
 +  cd ${TINKERMEM_PATH}
  fi
  
- touch gremlin-python/.glv
- touch gremlin-dotnet/src/.glv
- touch gremlin-dotnet/test/.glv
+ # touch gremlin-python/.glv
+ # touch gremlin-dotnet/src/.glv
+ # touch gremlin-dotnet/test/.glv
  
  # use a custom maven settings.xml
  if [ -r "settings.xml" ]; then

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

2017-09-17 Thread florianhockmann 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 36830f4948593640c720246ba362a507597b0f4b
Parents: 99f43ff 3bf128a
Author: florianhockmann 
Authored: Sun Sep 17 16:29:20 2017 +0200
Committer: florianhockmann 
Committed: Sun Sep 17 16:29:20 2017 +0200

--
 docker/scripts/build.sh   | 12 ++--
 gremlin-dotnet/glv/Gremlin.Net.csproj.template|  2 +-
 gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36830f49/docker/scripts/build.sh
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/36830f49/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
--

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

2017-09-13 Thread spmallette 
Merge branch 'tp32'

Conflicts:

gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyAddEdgeTest.groovy


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

Branch: refs/heads/master
Commit: 2c74df06d30a4aac40acc42105c3d07d2b1664fb
Parents: 5bfe873 214fb07
Author: Stephen Mallette 
Authored: Wed Sep 13 10:02:45 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 10:02:45 2017 -0400

--
 .../gremlin/process/traversal/step/map/AddEdgeTest.java  | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2c74df06/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index 337c09f,2f4658f..a12f5a8
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
@@@ -62,13 -63,44 +62,13 @@@ public abstract class AddEdgeTest exten
  
  public abstract Traversal 
get_g_addV_asXfirstX_repeatXaddEXnextX_toXaddVX_inVX_timesX5X_addEXnextX_toXselectXfirstXX();
  
- public abstract Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X();
+ public abstract Traversal 
get_g_withSideEffectXb_bX_VXaX_addEXknowsX_toXbX_propertyXweight_0_5X(final 
Vertex a, final Vertex v2);
  
 -///
 -
 -@Deprecated
 -public abstract Traversal 
get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(final Object v1Id);
 -
 -@Deprecated
 -public abstract Traversal 
get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_a_weight_2X(final Object v1Id);
 -
 -@Deprecated
 -public abstract Traversal 
get_g_withSideEffectXx__g_V_toListX_addOutEXexistsWith_x_time_nowX();
 -
 -@Deprecated
 -public abstract Traversal 
get_g_V_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_asXbX_selectXa_bX_addInEXa_codeveloper_b_year_2009X();
 +public abstract Traversal 
get_g_VXaX_addEXknowsX_toXbX_propertyXweight_0_1X();
  
 -@Deprecated
 -public abstract Traversal 
get_g_V_asXaX_inXcreatedX_addInEXcreatedBy_a_year_2009_acl_publicX();
 +public abstract Traversal 
get_g_addEXknowsX_fromXaX_toXbX_propertyXweight_0_1X();
  
 -@Test
 -@LoadGraphWith(MODERN)
 -@Deprecated
 -@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, 
feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
 -public void g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX() {
 -final Traversal traversal = 
get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(convertToVertexId("marko"));
 -printTraversalForm(traversal);
 -int count = 0;
 -while (traversal.hasNext()) {
 -final Edge edge = traversal.next();
 -assertEquals("createdBy", edge.label());
 -assertEquals(0, IteratorUtils.count(edge.properties()));
 -count++;
 -
 -}
 -assertEquals(1, count);
 -assertEquals(7, IteratorUtils.count(g.E()));
 -assertEquals(6, IteratorUtils.count(g.V()));
 -}
 +///
  
  @Test
  @LoadGraphWith(MODERN)

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

2017-09-13 Thread spmallette 
Merge branch 'tp32'

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

Branch: refs/heads/master
Commit: 5bfe87332337d12034751e38d3fc191f874440bb
Parents: b6af16f f96017b
Author: Stephen Mallette 
Authored: Wed Sep 13 09:07:30 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 09:07:30 2017 -0400

--

--

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

2017-09-13 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: b6af16fe91b2a91e4eeac612597acb4b8316b1a7
Parents: 175eae4 63191ae
Author: Stephen Mallette 
Authored: Wed Sep 13 06:56:44 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Sep 13 06:56:44 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 20 -
 .../op/traversal/TraversalOpProcessor.java  | 84 ++--
 .../server/GremlinServerIntegrateTest.java  | 34 
 4 files changed, 93 insertions(+), 46 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b6af16fe/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b6af16fe/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
--

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

2017-09-11 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: cd9cf9dad072c280d5a774c0fcba7c5678905946
Parents: ea7b6d95 c59393f
Author: Stephen Mallette 
Authored: Mon Sep 11 13:29:47 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Sep 11 13:29:47 2017 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../upgrade/release-3.2.x-incubating.asciidoc   | 17 -
 .../remote/EmbeddedRemoteConnection.java| 75 
 .../traversal/EmbeddedRemoteTraversal.java  | 56 +++
 .../EmbeddedRemoteTraversalSideEffects.java | 47 
 .../process/traversal/CoreTraversalTest.java| 18 -
 6 files changed, 209 insertions(+), 5 deletions(-)
--


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

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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd9cf9da/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
--
diff --cc 
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
index 566301b,6cffe2c..9893f01
--- 
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
+++ 
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/CoreTraversalTest.java
@@@ -22,10 -22,11 +22,12 @@@ import org.apache.tinkerpop.gremlin.Exc
  import org.apache.tinkerpop.gremlin.FeatureRequirement;
  import org.apache.tinkerpop.gremlin.LoadGraphWith;
  import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+ import org.apache.tinkerpop.gremlin.process.remote.EmbeddedRemoteConnection;
  import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+ import 
org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
  import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
  import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
 +import 
org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
  import 
org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
  import org.apache.tinkerpop.gremlin.structure.Edge;
  import org.apache.tinkerpop.gremlin.structure.Graph;
@@@ -307,12 -296,12 +310,12 @@@ public class CoreTraversalTest extends 
  public void shouldThrowFastNoSuchElementExceptionInNestedTraversals() {
  //The nested traversal should throw a regular 
FastNoSuchElementException
  
- GraphTraversal nestedTraversal = __.has("name", 
"foo");
- GraphTraversal traversal = g.V().has("name", 
"marko").branch(nestedTraversal);
+ final GraphTraversal nestedTraversal = __.has("name", 
"foo");
+ final GraphTraversal traversal = g.V().has("name", 
"marko").branch(nestedTraversal);
  
- GraphTraversal.Admin nestedTraversalAdmin = 
nestedTraversal.asAdmin();
+ final GraphTraversal.Admin nestedTraversalAdmin = 
nestedTraversal.asAdmin();
  nestedTraversalAdmin.reset();
 -
nestedTraversalAdmin.addStart(nestedTraversalAdmin.getTraverserGenerator().generate(g.V().has("name",
 "marko").next(), (Step)traversal.asAdmin().getStartStep(), 1l));
 +
nestedTraversalAdmin.addStart(nestedTraversalAdmin.getTraverserGenerator().generate(g.V().has("name",
 "marko").next(), (Step) traversal.asAdmin().getStartStep(), 1l));
  
  try {
  nestedTraversal.next();

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

2017-09-10 Thread rdale 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: ea7b6d954054d700b982f30799c0f2dad2cdf6f8
Parents: 4ddb09c 60a34d1
Author: Robert Dale 
Authored: Sun Sep 10 14:43:26 2017 -0400
Committer: Robert Dale 
Committed: Sun Sep 10 14:43:26 2017 -0400

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

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

2017-09-08 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4ddf0d3859fdf17a136daaae19b688fd745efd7f
Parents: d796ce3 0d494c0
Author: Stephen Mallette 
Authored: Fri Sep 8 12:20:14 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 8 12:20:14 2017 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-shaded/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4ddf0d38/gremlin-shaded/pom.xml
--

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

2017-09-07 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: db24e28b6cb6a1f526efce255791d0db19935ec8
Parents: 43a4a0b 6e2af00
Author: Stephen Mallette 
Authored: Thu Sep 7 05:55:25 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 7 05:55:25 2017 -0400

--
 docker/scripts/build.sh | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db24e28b/docker/scripts/build.sh
--
diff --cc docker/scripts/build.sh
index 79ccd53,dff60b5..1078acd
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -68,13 -64,11 +68,17 @@@ if [ -d "${TINKERMEM_PATH}" ]; the
  fi
  
  touch gremlin-python/.glv
 +# touch gremlin-dotnet/src/.glv
 +# touch gremlin-dotnet/test/.glv
 +
 +# remove these until TINKERPOP-1731 is settled
 +rm gremlin-dotnet/src/.glv
 +rm gremlin-dotnet/test/.glv
  
+ # remove these until TINKERPOP-1731 is settled
+ rm gremlin-dotnet/src/.glv
+ rm gremlin-dotnet/test/.glv
+ 
  # use a custom maven settings.xml
  if [ -r "settings.xml" ]; then
echo "Copying settings.xml"

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

2017-09-07 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 43a4a0b72297b9a7c0e94280ec3f0f46546983a0
Parents: 8e3f0e9 60a3e7a
Author: Stephen Mallette 
Authored: Thu Sep 7 05:54:40 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 7 05:54:40 2017 -0400

--
 docker/scripts/build.sh | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/43a4a0b7/docker/scripts/build.sh
--
diff --cc docker/scripts/build.sh
index f0797c4,dff60b5..79ccd53
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@@ -68,9 -64,11 +68,13 @@@ if [ -d "${TINKERMEM_PATH}" ]; the
  fi
  
  touch gremlin-python/.glv
 +# touch gremlin-dotnet/src/.glv
 +# touch gremlin-dotnet/test/.glv
  
+ # remove these until TINKERPOP-1731 is settled
+ rm gremlin-dotnet/src/.glv
+ rm gremlin-dotnet/test/.glv
+ 
  # use a custom maven settings.xml
  if [ -r "settings.xml" ]; then
echo "Copying settings.xml"

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

2017-09-01 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 63589b35b9d442a0367b4c06c31dcf5c54353ac3
Parents: d3220ab 397158a
Author: Stephen Mallette 
Authored: Fri Sep 1 13:48:19 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 1 13:48:19 2017 -0400

--
 CHANGELOG.asciidoc| 2 +-
 .../org/apache/tinkerpop/gremlin/console/Console.groovy   | 7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/63589b35/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
--

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

2017-08-29 Thread spmallette 
Merge branch 'tp32'

Conflicts:

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


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

Branch: refs/heads/master
Commit: 4d09fe540f7011e1289e46619c2c0d248fc89da2
Parents: 9940560 b5836ed
Author: Stephen Mallette 
Authored: Tue Aug 29 10:55:38 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 29 10:55:38 2017 -0400

--
 .../process/traversal/step/branch/RepeatTest.java|  2 +-
 .../process/traversal/step/filter/DedupTest.java |  2 +-
 .../process/traversal/step/sideEffect/GroupTest.java | 15 ---
 3 files changed, 10 insertions(+), 9 deletions(-)
--

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

2017-08-29 Thread okram 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 9940560449d5f3fd9046cebced3b0d31677befe5
Parents: 2556630 1a95df0
Author: Marko A. Rodriguez 
Authored: Tue Aug 29 07:52:44 2017 -0600
Committer: Marko A. Rodriguez 
Committed: Tue Aug 29 07:52:44 2017 -0600

--
 .../jython/tests/driver/test_driver_remote_connection.py| 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99405604/gremlin-python/src/main/jython/tests/driver/test_driver_remote_connection.py
--

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

2017-08-29 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 25566305a86fc4fa65b51c5af1ed4073528c24aa
Parents: 05465d4 5ab53ac
Author: Stephen Mallette 
Authored: Tue Aug 29 08:35:18 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 29 08:35:18 2017 -0400

--

--

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

2017-08-29 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 05465d4755f277ead3c352d08345e95a42c7e8e2
Parents: 8340ca7 2a2ecb0
Author: Stephen Mallette 
Authored: Tue Aug 29 08:34:33 2017 -0400
Committer: Stephen Mallette 
Committed: Tue Aug 29 08:34:33 2017 -0400

--
 CHANGELOG.asciidoc  |  2 ++
 .../gremlin/jsr223/DefaultImportCustomizer.java | 25 
 .../jsr223/GremlinJythonScriptEngine.java   |  2 +-
 .../tinkerpop/gremlin/server/Settings.java  |  4 +++-
 .../neo4j/jsr223/Neo4jGremlinPlugin.java|  6 ++---
 5 files changed, 33 insertions(+), 6 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/05465d47/gremlin-python/src/main/java/org/apache/tinkerpop/gremlin/python/jsr223/GremlinJythonScriptEngine.java
--

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

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

2017-08-28 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 98da4c09fe2d4370791a44b208dfcc2746b7669f
Parents: 18ea97d eb57077
Author: Stephen Mallette 
Authored: Mon Aug 28 11:40:25 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 28 11:40:25 2017 -0400

--
 docs/src/reference/the-traversal.asciidoc   | 21 +++-
 .../src/main/jython/tests/process/test_dsl.py   |  6 ++
 2 files changed, 14 insertions(+), 13 deletions(-)
--


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

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

2017-08-28 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 18ea97d941d7987c0499c4e895706452377170c0
Parents: 441f96b 7c954e9
Author: Stephen Mallette 
Authored: Mon Aug 28 11:27:39 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 28 11:27:39 2017 -0400

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


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

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

2017-08-28 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 441f96b9cc63592d38c43c0e576bd19c9dd58197
Parents: 4d5bfbc 75b3d74
Author: Stephen Mallette 
Authored: Mon Aug 28 09:24:10 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 28 09:24:10 2017 -0400

--

--

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

2017-08-28 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4d5bfbcd461ccef031b1a18199e9d0b22017d088
Parents: 6eb7155 5b0a756
Author: Stephen Mallette 
Authored: Mon Aug 28 09:22:37 2017 -0400
Committer: Stephen Mallette 
Committed: Mon Aug 28 09:22:37 2017 -0400

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


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

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

2017-08-22 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 9148c76a60d6f7c6b376c3a460da24277967409d
Parents: a2ec8f0 529b819
Author: Daniel Kuppitz 
Authored: Tue Aug 22 09:11:36 2017 -0700
Committer: Daniel Kuppitz 
Committed: Tue Aug 22 09:11:36 2017 -0700

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

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

2017-08-16 Thread rdale 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: c1f374af80588d4e6debbc439b1e5aed761f45b5
Parents: 738923d ad12776
Author: Robert Dale 
Authored: Wed Aug 16 13:44:56 2017 -0400
Committer: Robert Dale 
Committed: Wed Aug 16 13:44:56 2017 -0400

--
 CHANGELOG.asciidoc | 1 +
 pom.xml| 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
--


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

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

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

2017-08-16 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 738923d70be09d9bbc238144575f6b36bba504d2
Parents: 71eab27 92735c8
Author: Daniel Kuppitz 
Authored: Wed Aug 16 08:41:22 2017 -0700
Committer: Daniel Kuppitz 
Committed: Wed Aug 16 08:41:22 2017 -0700

--

--

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

2017-08-11 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 61af5028b567a2671f05038ce85db447cf91dfd1
Parents: 4023d74 47a833c
Author: Stephen Mallette 
Authored: Fri Aug 11 09:34:29 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 11 09:34:29 2017 -0400

--

--

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

2017-08-11 Thread dkuppitz 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4023d74ccf7b34b1393c2393fdd09ceb4f4bfcf4
Parents: 392ada6 628d708
Author: Daniel Kuppitz 
Authored: Fri Aug 11 06:33:45 2017 -0700
Committer: Daniel Kuppitz 
Committed: Fri Aug 11 06:33:45 2017 -0700

--

--

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

2017-08-11 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 21a454b2b18dc8cde0f13cf69f3b71c731ff6961
Parents: 4d1e12c 1af6a96
Author: Stephen Mallette 
Authored: Fri Aug 11 09:32:48 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 11 09:32:48 2017 -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/21a454b2/docs/src/reference/the-traversal.asciidoc
--

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

2017-08-11 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: d083c942b8ddf2fae46471faaa4417a4fb07a7c4
Parents: 6f8a2a9 e96ed0c
Author: Stephen Mallette 
Authored: Fri Aug 11 08:00:48 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 11 08:00:48 2017 -0400

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

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

2017-08-11 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: b4224fbcf1b66b3c3f0e3d1776b5994fc7bf205f
Parents: 29c95ca df7b0f1
Author: Stephen Mallette 
Authored: Fri Aug 11 07:33:11 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 11 07:33:11 2017 -0400

--
 .../upgrade/release-3.2.x-incubating.asciidoc   | 21 +---
 1 file changed, 18 insertions(+), 3 deletions(-)
--


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

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

2017-08-11 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 29c95ca48256f741caf41a6876952d74c463dda8
Parents: 8dfdeeb 73901a7
Author: Stephen Mallette 
Authored: Fri Aug 11 07:03:46 2017 -0400
Committer: Stephen Mallette 
Committed: Fri Aug 11 07:03:46 2017 -0400

--
 docs/src/recipes/between-vertices.asciidoc | 52 +
 1 file changed, 28 insertions(+), 24 deletions(-)
--

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

2017-08-10 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 8dfdeebdfc21794965800c2a214f8092efe32e15
Parents: e5fa5aa 7a2fd93
Author: Stephen Mallette 
Authored: Thu Aug 10 15:27:36 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Aug 10 15:27:36 2017 -0400

--
 .../the-gremlin-console/index.asciidoc  | 57 +---
 1 file changed, 39 insertions(+), 18 deletions(-)
--

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

2017-08-10 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 9fd97b455395d67c4bdc5f20badbd43c1b283970
Parents: 345d162 89c18ba
Author: Stephen Mallette 
Authored: Thu Aug 10 12:06:16 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Aug 10 12:06:16 2017 -0400

--
 .../tutorials/getting-started/index.asciidoc| 43 ++--
 1 file changed, 30 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9fd97b45/docs/src/tutorials/getting-started/index.asciidoc
--

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

2017-08-10 Thread spmallette 
Merge branch 'tp32'

Conflicts:

gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java


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

Branch: refs/heads/master
Commit: 345d162f04cd615372c53ff23d577bd8f9d6c551
Parents: 291526f 55ebe13
Author: Stephen Mallette 
Authored: Thu Aug 10 09:40:10 2017 -0400
Committer: Stephen Mallette 
Committed: Thu Aug 10 09:40:10 2017 -0400

--
 CHANGELOG.asciidoc |  1 +
 .../gremlin/structure/io/gryo/GryoVersion.java | 17 ++---
 2 files changed, 15 insertions(+), 3 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/345d162f/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 dbb2639,f7e5a1d..fc39cb0
--- 
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
@@@ -208,180 -165,6 +208,181 @@@ public enum GryoVersion 
  return versionNumber;
  }
  
 +public static List initV3d0Registrations() {
 +return new ArrayList() {{
 +add(GryoTypeReg.of(byte[].class, 25));
 +add(GryoTypeReg.of(char[].class, 26));
 +add(GryoTypeReg.of(short[].class, 27));
 +add(GryoTypeReg.of(int[].class, 28));
 +add(GryoTypeReg.of(long[].class, 29));
 +add(GryoTypeReg.of(float[].class, 30));
 +add(GryoTypeReg.of(double[].class, 31));
 +add(GryoTypeReg.of(String[].class, 32));
 +add(GryoTypeReg.of(Object[].class, 33));
 +add(GryoTypeReg.of(ArrayList.class, 10));
 +add(GryoTypeReg.of(Types.ARRAYS_AS_LIST, 134, new 
UtilSerializers.ArraysAsListSerializer()));
 +add(GryoTypeReg.of(BigInteger.class, 34));
 +add(GryoTypeReg.of(BigDecimal.class, 35));
 +add(GryoTypeReg.of(Calendar.class, 39));
 +add(GryoTypeReg.of(Class.class, 41, new 
UtilSerializers.ClassSerializer()));
 +add(GryoTypeReg.of(Class[].class, 166, new 
UtilSerializers.ClassArraySerializer()));
 +add(GryoTypeReg.of(Collection.class, 37));
 +add(GryoTypeReg.of(Collections.EMPTY_LIST.getClass(), 51));
 +add(GryoTypeReg.of(Collections.EMPTY_MAP.getClass(), 52));
 +add(GryoTypeReg.of(Collections.EMPTY_SET.getClass(), 53));
 +add(GryoTypeReg.of(Collections.singleton(null).getClass(), 54));
 +add(GryoTypeReg.of(Collections.singletonList(null).getClass(), 
24));
 +add(GryoTypeReg.of(Collections.singletonMap(null, 
null).getClass(), 23));
 +add(GryoTypeReg.of(Contains.class, 49));
 +add(GryoTypeReg.of(Currency.class, 40));
 +add(GryoTypeReg.of(Date.class, 38));
 +add(GryoTypeReg.of(Direction.class, 12));
 +add(GryoTypeReg.of(DetachedEdge.class, 21));
 +add(GryoTypeReg.of(DetachedVertexProperty.class, 20));
 +add(GryoTypeReg.of(DetachedProperty.class, 18));
 +add(GryoTypeReg.of(DetachedVertex.class, 19));
 +add(GryoTypeReg.of(DetachedPath.class, 60));
 +// skip 14
 +add(GryoTypeReg.of(EnumSet.class, 46));
 +add(GryoTypeReg.of(HashMap.class, 11));
 +add(GryoTypeReg.of(HashMap.Entry.class, 16));
 +add(GryoTypeReg.of(Types.HASH_MAP_NODE, 92));
++add(GryoTypeReg.of(Types.HASH_MAP_TREE_NODE, 172));   
   // ***LAST ID***
 +add(GryoTypeReg.of(KryoSerializable.class, 36));
 +add(GryoTypeReg.of(LinkedHashMap.class, 47));
 +add(GryoTypeReg.of(LinkedHashSet.class, 71));
 +add(GryoTypeReg.of(ConcurrentHashMap.class, 170));
- add(GryoTypeReg.of(ConcurrentHashMap.Entry.class, 171));  
 // ***LAST ID***
++add(GryoTypeReg.of(ConcurrentHashMap.Entry.class, 171));
 +add(GryoTypeReg.of(LinkedList.class, 116));
 +add(GryoTypeReg.of(Types.LINKED_HASH_MAP_ENTRY_CLASS, 15));
 +add(GryoTypeReg.of(Locale.class, 22));
 +

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

2017-08-09 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 4e418c1926f264f73959c8fa546ad5ad21095677
Parents: 7d4ed90 bf72bd7
Author: Stephen Mallette 
Authored: Wed Aug 9 13:46:04 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Aug 9 13:46:04 2017 -0400

--
 docs/src/reference/gremlin-applications.asciidoc | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


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

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

2017-08-09 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: 7d4ed90a10cb019b055ade286fbb93111e04f8c7
Parents: d80917b 60f2557
Author: Stephen Mallette 
Authored: Wed Aug 9 12:31:26 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Aug 9 12:31:26 2017 -0400

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

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

2017-08-09 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: d80917bcda3f36c15f9f949056160e86a0ae3217
Parents: f1c3948 0108bfc
Author: Stephen Mallette 
Authored: Wed Aug 9 10:49:51 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Aug 9 10:49:51 2017 -0400

--
 docs/src/index.asciidoc | 25 -
 1 file changed, 16 insertions(+), 9 deletions(-)
--

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

2017-08-09 Thread spmallette 
Merge branch 'tp32'


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

Branch: refs/heads/master
Commit: f1c39481a8885bf622321ee623fc346368553556
Parents: 1e3c359 1e46fc4
Author: Stephen Mallette 
Authored: Wed Aug 9 07:09:27 2017 -0400
Committer: Stephen Mallette 
Committed: Wed Aug 9 07:09:27 2017 -0400

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


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

<    1   2   3   4   >