You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/07/03 17:19:41 UTC

[tinkerpop] branch TINKERPOP-1553 updated (e25b523 -> 525e24e)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch TINKERPOP-1553
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


 discard e25b523  TINKERPOP-1553 Deprecate store(String) for aggregate(Scope,String)
     add 66c04e8  Remove import that is no longer available CTR
     add bd28ea2  Merge branch 'tp33' into tp34
     add 59445da  Removed some old references to BLVP - it's been long deprecated. CTR
     add 761dc05  Merge branch 'tp33' into tp34
     add 9a6bf66  TINKERPOP-1084 Allow predicates and traversals to be used as options in `BranchStep`.
     add 5f05bf1  Merge pull request #1129 from apache/TINKERPOP-1084
     add 4471cc5  Merge branch 'tp33' into tp34
     add 41f26b4  TINKERPOP-2250 Setup GraphBinary toString serializer
     add 58b814a  TINKERPOP-2250 Updated changelog
     add 75f108c  TINKERPOP-2250 Deprecate Gryo in Gremlin Server
     add f656c1c  TINKERPOP-2250 Minor fixes to config file spacing
     add 0870145  TINKERPOP-2250 Update docs with most recent Gremlin Server output
     add 7c169e2  Merge branch 'TINKERPOP-2250' into tp34
     add b70e6b6  Added notes to with() regarding differences for js/python CTR
     add b4a16c4  Minor fix to NOTE CTR
     add 1e03e20  Merge branch 'tp33' into tp34
     add 989bbec  Minor fix to NOTE CTR
     add 96711c8  Merge branch 'tp33' into tp34
     add d2efcc6  Minor tweaks to test Gremlin Server docker startup
     add 264cc75  Pinned to pytest 4.6.4 as 5.0.0 seems to cause and error.
     add 8737d6c  Merge branch 'tp33' into tp34
     add 6284410  Pin pytest in gremlin-console tests to avoid errors on 5.0 CTR
     add 448e81e  Merge branch 'tp33' into tp34
     add 8fe711d  CTR: Fixed Gremlin Server docker script.
     add 525e24e  TINKERPOP-1553 Deprecate store(String) for aggregate(Scope,String)

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (e25b523)
            \
             N -- N -- N   refs/heads/TINKERPOP-1553 (525e24e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 CHANGELOG.asciidoc                                 |   4 +
 docker/gremlin-server.sh                           |   9 +-
 docker/gremlin-server/Dockerfile.template          |   5 +-
 .../gremlin-server-integration-secure.yaml         |   1 +
 .../gremlin-server/gremlin-server-integration.yaml |   1 +
 docs/src/reference/gremlin-applications.asciidoc   |  15 ++-
 docs/src/reference/gremlin-variants.asciidoc       |   6 +-
 docs/src/reference/implementations-neo4j.asciidoc  |  30 -----
 docs/src/reference/the-traversal.asciidoc          |  12 +-
 docs/src/tutorials/getting-started/index.asciidoc  |   5 +-
 .../gremlin-language-variants/index.asciidoc       |   6 +-
 docs/src/upgrade/release-3.3.x.asciidoc            |  30 +++++
 docs/src/upgrade/release-3.4.x.asciidoc            |   8 ++
 gremlin-console/conf/remote-objects.yaml           |   9 +-
 gremlin-console/conf/remote-secure.yaml            |   2 +-
 gremlin-console/conf/remote.yaml                   |   4 +-
 .../console/jsr223/DriverGremlinPlugin.java        |   2 +
 gremlin-console/src/test/python/setup.py           |   2 +-
 .../console/jsr223/gremlin-server-integration.yaml |   2 +-
 .../tinkerpop/gremlin/console/jsr223/remote.yaml   |   2 +-
 ...{LoopTraversal.java => PredicateTraversal.java} |  40 +++---
 .../process/traversal/step/branch/BranchStep.java  | 139 +++++++++++----------
 .../process/traversal/step/branch/ChooseStep.java  |  10 +-
 .../process/traversal/step/branch/UnionStep.java   |   2 +-
 .../handler/WebSocketGremlinRequestEncoder.java    |   3 -
 .../ser/AbstractGryoMessageSerializerV1d0.java     |   2 +
 .../ser/AbstractGryoMessageSerializerV3d0.java     |   2 +
 .../driver/ser/GraphBinaryMessageSerializerV1.java |  39 +++++-
 .../driver/ser/GryoMessageSerializerV1d0.java      |   2 +
 .../driver/ser/GryoMessageSerializerV3d0.java      |   2 +
 .../binary/GraphBinaryMessageSerializerV1Test.java |  17 +++
 gremlin-python/src/main/jython/setup.py            |   5 +-
 gremlin-server/conf/gremlin-server-classic.yaml    |   1 +
 gremlin-server/conf/gremlin-server-modern-py.yaml  |   9 +-
 .../conf/gremlin-server-modern-readonly.yaml       |   9 +-
 gremlin-server/conf/gremlin-server-modern.yaml     |   9 +-
 gremlin-server/conf/gremlin-server-neo4j.yaml      |   1 +
 gremlin-server/conf/gremlin-server-secure.yaml     |   1 +
 gremlin-server/conf/gremlin-server-spark.yaml      |   1 +
 gremlin-server/conf/gremlin-server.yaml            |   9 +-
 .../gremlin/server/AbstractChannelizer.java        |  10 +-
 .../server/GremlinServerAuthKrb5IntegrateTest.java |  26 ++--
 .../gremlin/server/gremlin-server-integration.yaml |   1 +
 gremlin-test/features/branch/Branch.feature        |  37 +++++-
 .../process/traversal/step/ComplexTest.java        |  46 ++++++-
 .../process/traversal/step/branch/BranchTest.java  |  47 +++++++
 .../tinkergraph/structure/TinkerGraphPlayTest.java |   6 +
 47 files changed, 438 insertions(+), 193 deletions(-)
 copy gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/lambda/{LoopTraversal.java => PredicateTraversal.java} (57%)