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 2015/04/21 18:18:05 UTC
[11/12] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master' into refactor-io
Merge remote-tracking branch 'origin/master' into refactor-io
Conflicts:
tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/e4301a8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/e4301a8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/e4301a8c
Branch: refs/heads/master
Commit: e4301a8c205412eacefdaaa6544cda9d17a30687
Parents: 4d8c438 8df91fc
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 21 06:43:08 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 21 06:43:08 2015 -0400
----------------------------------------------------------------------
LICENSE | 33 +-
NOTICE | 12 +-
README.asciidoc | 3 +-
data/grateful-dead-vertices.kryo | Bin 975214 -> 975214 bytes
data/grateful-dead-vertices.ldjson | 422 +++---
data/script-input.groovy | 39 +
data/tinkerpop-classic.txt | 6 +
docs/src/implementations.asciidoc | 117 +-
docs/src/the-graph.asciidoc | 3 +-
docs/src/the-traversal.asciidoc | 3 +
docs/static/images/adjacency-list.png | Bin 0 -> 36192 bytes
docs/static/images/tinkerpop3.graffle | 1334 +++++++++++++++++-
docs/stylesheets/asciidoctor.css | 656 ---------
docs/stylesheets/colony.css | 662 ---------
docs/stylesheets/foundation-lime.css | 659 ---------
docs/stylesheets/foundation-potion.css | 659 ---------
docs/stylesheets/foundation.css | 650 ---------
docs/stylesheets/github.css | 671 ---------
docs/stylesheets/golo.css | 673 ---------
docs/stylesheets/iconic.css | 694 ---------
docs/stylesheets/maker.css | 670 ---------
docs/stylesheets/readthedocs.css | 671 ---------
docs/stylesheets/riak.css | 691 ---------
docs/stylesheets/rocket-panda.css | 664 ---------
docs/stylesheets/rubygems.css | 652 ---------
docs/stylesheets/tinkerpop.css | 19 +
docs/stylesheets/tinkerpop.scss | 83 --
gremlin-console/bin/gremlin.sh | 4 +-
gremlin-console/pom.xml | 2 +-
gremlin-console/src/assembly/distribution.xml | 16 +-
gremlin-console/src/assembly/standalone.xml | 3 +
gremlin-console/src/main/LICENSE | 2 +-
.../ser/AbstractJsonMessageSerializerV1d0.java | 37 +-
.../driver/ser/GryoMessageSerializerV1d0.java | 1 -
.../driver/ser/JsonMessageSerializerV1d0.java | 16 +-
.../step/filter/GroovyExceptTest.groovy | 16 +-
gremlin-server/data/sample.kryo | Bin 4781783 -> 4781767 bytes
gremlin-server/pom.xml | 178 +--
gremlin-server/src/assembly/distribution.xml | 16 +-
gremlin-server/src/assembly/standalone.xml | 3 +
gremlin-server/src/main/LICENSE | 2 +-
.../handler/HttpGremlinEndpointHandler.java | 4 +-
.../gremlin/server/handler/IteratorHandler.java | 6 +-
.../handler/NioGremlinResponseEncoder.java | 20 +-
.../server/handler/OpExecutorHandler.java | 6 +-
.../server/handler/OpSelectorHandler.java | 6 +-
.../handler/WsGremlinResponseEncoder.java | 22 +-
.../src/test/resources/application.conf | 26 -
gremlin-server/src/test/resources/gatling.conf | 109 --
.../src/test/resources/logback-test.xml | 39 -
.../GremlinServerAdditionSimulation.scala | 96 --
.../traversal/step/filter/ExceptTest.java | 31 +-
.../io/gryo/grateful-dead-vertices.kryo | Bin 975214 -> 975214 bytes
hadoop-gremlin/conf/hadoop-script.properties | 52 +
pom.xml | 17 +-
tinkergraph-gremlin/pom.xml | 28 +
.../tinkergraph/structure/TinkerGraphTest.java | 19 +
57 files changed, 1935 insertions(+), 9588 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e4301a8c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/AbstractJsonMessageSerializerV1d0.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e4301a8c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/ser/GryoMessageSerializerV1d0.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/e4301a8c/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --cc tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 6707ce2,107b3a7..f27787c
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@@ -21,7 -21,8 +21,9 @@@ package org.apache.tinkerpop.gremlin.ti
import org.apache.commons.io.FileUtils;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.TestHelper;
+import org.apache.tinkerpop.gremlin.structure.io.graphml.GraphMLIo;
+ import org.apache.tinkerpop.gremlin.algorithm.generator.DistributionGenerator;
+ import org.apache.tinkerpop.gremlin.algorithm.generator.PowerLawDistribution;
import org.apache.tinkerpop.gremlin.structure.util.star.StarGraph;
import org.apache.tinkerpop.gremlin.process.traversal.T;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;