[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-10-04 Thread spmallette 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 2d69efd50373835a2962c48b42f6b81935d24152
Parents: e330ad6 86b1be5
Author: Stephen Mallette 
Authored: Thu Oct 4 16:47:56 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Oct 4 16:47:56 2018 -0400

--
 .../apache/tinkerpop/gremlin/process/computer/GraphFilter.java  | 5 +++--
 .../traversal/strategy/optimization/GraphFilterStrategy.java| 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)
--

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-10-03 Thread spmallette 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 7ac00a13b4bfce60bc62e5c8d952681027ffebed
Parents: b788201 650f31f
Author: Stephen Mallette 
Authored: Wed Oct 3 06:13:04 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Oct 3 06:13:04 2018 -0400

--
 .../traversal/dsl/graph/GraphTraversal.java | 48 
 .../step/sideEffect/SideEffectCapStep.java  |  4 +-
 2 files changed, 30 insertions(+), 22 deletions(-)
--


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

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-09-21 Thread spmallette 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 8b5a437a6c4dbf92a7200558af51914d3700baca
Parents: 0af451e bf79a49
Author: Stephen Mallette 
Authored: Fri Sep 21 15:38:03 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Sep 21 15:38:03 2018 -0400

--
 CHANGELOG.asciidoc   |  1 +
 .../Gremlin.Net/Driver/WebSocketConnection.cs| 19 ---
 2 files changed, 17 insertions(+), 3 deletions(-)
--


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

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-08-22 Thread rdale 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: de29c768a5f6fd88b5c36c63adc6a31631f29bb5
Parents: a085355 b34515a
Author: Robert Dale 
Authored: Wed Aug 22 12:42:59 2018 -0400
Committer: Robert Dale 
Committed: Wed Aug 22 12:42:59 2018 -0400

--
 .../jsr223/AbstractGremlinScriptEngineFactory.java  |  6 +++---
 .../process/traversal/dsl/GremlinDslProcessor.java  | 12 +++-
 .../traversal/util/DefaultTraversalMetrics.java | 16 +---
 3 files changed, 19 insertions(+), 15 deletions(-)
--

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-07-12 Thread jorgebg 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 3cd352eeb2503d6c5e3ff9b8d8256eb92f28692d
Parents: 2fd11a1 bf07f13
Author: Jorge Bay Gondra 
Authored: Thu Jul 12 11:53:19 2018 +0200
Committer: Jorge Bay Gondra 
Committed: Thu Jul 12 11:53:19 2018 +0200

--
 CHANGELOG.asciidoc  |  1 +
 .../lib/driver/driver-remote-connection.js  | 20 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)
--


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

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-06-09 Thread florianhockmann 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: d3b6a340dbb9c89355c40089a5c083dc0dbd4c5b
Parents: ae2f304 d4c76a6
Author: Florian Hockmann 
Authored: Sat Jun 9 13:34:46 2018 +0200
Committer: Florian Hockmann 
Committed: Sat Jun 9 13:34:46 2018 +0200

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

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-05-17 Thread spmallette 
Merge branch 'tp33'

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

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java


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

Branch: refs/heads/master
Commit: 9eec6557818938ad1c6e19b1c84d1bd18d69f941
Parents: 32c5306 20a722a
Author: Stephen Mallette 
Authored: Thu May 17 16:28:14 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 17 16:28:14 2018 -0400

--
 CHANGELOG.asciidoc  |   1 +
 docs/site/home/gremlin.html |   4 +-
 docs/site/home/index.html   |   2 +-
 docs/site/home/js/prism.js  |   2 +-
 docs/src/dev/io/graphson.asciidoc   |   8 +-
 docs/src/dev/io/gryo.asciidoc   |   4 +-
 docs/src/recipes/centrality.asciidoc|   6 +-
 docs/src/recipes/collections.asciidoc   |   2 +-
 docs/src/recipes/recommendation.asciidoc|  16 +-
 docs/src/recipes/style-guide.asciidoc   |   4 +-
 docs/src/reference/gremlin-variants.asciidoc|  10 +-
 docs/src/reference/the-graph.asciidoc   |   2 +-
 docs/src/reference/the-traversal.asciidoc   |  61 
 .../gremlin-language-variants/index.asciidoc|   2 +-
 docs/src/upgrade/release-3.3.x.asciidoc |  10 ++
 .../gremlin/process/traversal/Order.java|  40 +
 .../traversal/step/map/OrderGlobalStep.java |   4 +-
 .../traversal/step/map/OrderLocalStep.java  |   4 +-
 .../util/function/ChainedComparator.java|   2 +-
 .../gremlin/util/function/MultiComparator.java  |   2 +-
 .../gremlin/process/traversal/BytecodeTest.java |   6 +-
 .../gremlin/process/traversal/OrderTest.java|  15 ++
 .../traversal/step/map/OrderGlobalStepTest.java |   8 +-
 .../traversal/step/map/OrderLocalStepTest.java  |   8 +-
 .../PathRetractionStrategyTest.java |   2 +-
 .../LambdaRestrictionStrategyTest.java  |   4 +-
 .../util/function/MultiComparatorTest.java  |   6 +-
 .../Process/Traversal/NamingConversions.cs  |   2 +
 .../src/Gremlin.Net/Process/Traversal/Order.cs  |   6 +
 .../DriverRemoteConnection/EnumTests.cs |   2 +-
 .../gremlin-javascript/lib/process/traversal.js |   2 +-
 .../test/unit/traversal-test.js |   4 +-
 .../jython/gremlin_python/process/traversal.py  |   4 +-
 gremlin-test/features/branch/Local.feature  |   2 +-
 gremlin-test/features/filter/Dedup.feature  |   4 +-
 gremlin-test/features/map/AddEdge.feature   |   4 +-
 gremlin-test/features/map/Match.feature |   4 +-
 gremlin-test/features/map/Order.feature |  72 ++---
 gremlin-test/features/map/Project.feature   |   4 +-
 gremlin-test/features/map/Select.feature|   4 +-
 .../process/traversal/step/ComplexTest.java |   4 +-
 .../traversal/step/branch/LocalTest.java|   2 +-
 .../traversal/step/filter/DedupTest.java|  10 +-
 .../process/traversal/step/map/AddEdgeTest.java |  12 +-
 .../process/traversal/step/map/MatchTest.java   |  12 +-
 .../process/traversal/step/map/MathTest.java|  12 +-
 .../process/traversal/step/map/OrderTest.java   | 150 +++
 .../traversal/step/map/PageRankTest.java|  20 +--
 .../process/traversal/step/map/ProgramTest.java |  10 +-
 .../process/traversal/step/map/ProjectTest.java |  10 +-
 .../process/traversal/step/map/SelectTest.java  |  10 +-
 .../decoration/SubgraphStrategyProcessTest.java |   2 +-
 .../gremlin/process/FeatureCoverageTest.java|   4 +-
 .../tinkerpop/gremlin/structure/io/Model.java   |   2 +-
 .../io/AbstractTypedCompatibilityTest.java  |   2 -
 .../io/graphson/_3_2_3/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_3/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_4/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_4/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_5/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_5/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_6/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_6/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_7/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_7/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_8/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_8/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_2_9/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_2_9/order-v2d0-partial.json  |   2 +-
 .../io/graphson/_3_3_0/order-v2d0-no-types.json |   2 +-
 .../io/graphson/_3_3_0/order-v2d0-partial.json  |   2 +-

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-05-08 Thread spmallette 
Merge branch 'tp33'

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


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

Branch: refs/heads/master
Commit: bf77d6d1bdd7d81dc0215addaf4fefc304367f99
Parents: 1818c89 2d39f9b
Author: Stephen Mallette 
Authored: Tue May 8 14:21:19 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 8 14:21:19 2018 -0400

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


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

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-04-20 Thread spmallette 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: a098437886e05142a551d8574142052963726dac
Parents: cfa14e2 7e6e985
Author: Stephen Mallette 
Authored: Fri Apr 20 19:26:44 2018 -0400
Committer: Stephen Mallette 
Committed: Fri Apr 20 19:26:44 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 .../io/graphson/TraversalSerializersV2d0.java   | 35 +---
 .../io/graphson/TraversalSerializersV3d0.java   | 33 --
 3 files changed, 47 insertions(+), 22 deletions(-)
--


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

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-04-09 Thread spmallette 
Merge branch 'tp33'

Conflicts:
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json


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

Branch: refs/heads/master
Commit: 46b743d43d371061a881d6caa4a7b2983c01f172
Parents: 6040ce0 46be135
Author: Stephen Mallette 
Authored: Mon Apr 9 11:31:55 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Apr 9 11:31:55 2018 -0400

--
 docs/src/dev/developer/release.asciidoc   |  5 +
 gremlin-javascript/glv/PackageJson.template   |  2 +-
 gremlin-javascript/pom.xml| 10 +-
 .../src/main/javascript/gremlin-javascript/README.md  |  2 +-
 .../src/main/javascript/gremlin-javascript/package.json   |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46b743d4/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
--
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 71b58b2,76a2dd6..50c461d
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@@ -1,6 -1,6 +1,6 @@@
  {
-   "name": "gremlin-javascript",
+   "name": "gremlin",
 -  "version": "3.3.3-alpha1",
 +  "version": "3.4.0-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-03-22 Thread spmallette 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: ead0edaf44b29d9576a72b10ff5e18c265775f31
Parents: fc0ed43 ffabea8
Author: Stephen Mallette 
Authored: Thu Mar 22 15:06:14 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Mar 22 15:06:14 2018 -0400

--
 .../Gherkin/CommonSteps.cs  |  5 ++--
 .../Gherkin/GherkinTestRunner.cs|  4 +++-
 .../Gherkin/IgnoreException.cs  |  4 
 .../Gherkin/ScenarioData.cs | 24 +---
 .../RemoteConnectionFactory.cs  |  6 ++---
 gremlin-test/features/map/Order.feature |  2 +-
 6 files changed, 19 insertions(+), 26 deletions(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ead0edaf/gremlin-test/features/map/Order.feature
--

[5/5] tinkerpop git commit: Merge branch 'tp33'

2018-03-21 Thread dkuppitz 
Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: f532f9edf7224f6318275fa1e103ce15942065dd
Parents: ea611c5 da8588b
Author: Daniel Kuppitz 
Authored: Wed Mar 21 12:59:47 2018 -0700
Committer: Daniel Kuppitz 
Committed: Wed Mar 21 12:59:47 2018 -0700

--
 .travis.yml   | 1 +
 spark-gremlin/pom.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
--


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