GitHub user spmallette opened a pull request:

    https://github.com/apache/tinkerpop/pull/795

    TINKERPOP-1877 Added the "kitchen sink" toy graph (master)

    This is the sister PR to #794 that goes to master. It was conflicted and 
needed some extra code here and there to all work so I opted to do a separate 
PR.
    
    All tests pass with `docker/build.sh -t -n -i`
    
    VOTE +1

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/apache/tinkerpop TINKERPOP-1877-master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/tinkerpop/pull/795.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #795
    
----
commit 5f67d9c88cf637984a2982b4beeda9134eb01fe5
Author: Stephen Mallette <spmva@...>
Date:   2018-01-31T15:46:22Z

    TINKERPOP-1877 Added the "kitchen sink" toy graph
    
    Contains a single self-loop subgraph at this point.

commit eb6bf217c90fa9da40f1a155f024991cadff3deb
Author: Stephen Mallette <spmva@...>
Date:   2018-02-01T12:48:20Z

    Merge branch 'TINKERPOP-1877' into TINKERPOP-1877-master
    
    Conflicts:
        
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/branch/GroovyRepeatTest.groovy
        
gremlin-server/src/test/resources/org/apache/tinkerpop/gremlin/driver/remote/gremlin-server-integration.yaml
        
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/LoadGraphWith.java
        
hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java
        
tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/IoDataGenerationTest.java

commit eacaf10612bd9122a0b7c0771c466160f30791d8
Author: Stephen Mallette <spmva@...>
Date:   2018-02-01T19:24:03Z

    TINKERPOP-1877 Fixed path to kitchen sink graph for hadoop

----


---

Reply via email to