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 2016/12/29 11:29:47 UTC
[1/2] tinkerpop git commit: TINKERPOP-1587 Forgot to update the both
TinkerGraph serializers CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 59d0a6957 -> a4bff0c34
TINKERPOP-1587 Forgot to update the both TinkerGraph serializers CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ab2ca16c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ab2ca16c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ab2ca16c
Branch: refs/heads/master
Commit: ab2ca16c73b03b0c92e31cd0ed60037b3b6c28d7
Parents: cc918df
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Dec 29 06:29:02 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Dec 29 06:29:02 2016 -0500
----------------------------------------------------------------------
.../gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ab2ca16c/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
index 83ee26f..200efd8 100644
--- a/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
+++ b/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java
@@ -18,6 +18,8 @@
*/
package org.apache.tinkerpop.gremlin.tinkergraph.structure;
+import org.apache.commons.configuration.BaseConfiguration;
+import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.apache.tinkerpop.gremlin.structure.io.AbstractIoRegistry;
@@ -105,7 +107,9 @@ public final class TinkerIoRegistryV2d0 extends AbstractIoRegistry {
@Override
public TinkerGraph read(final Kryo kryo, final Input input, final Class<TinkerGraph> tinkerGraphClass) {
- final TinkerGraph graph = TinkerGraph.open();
+ final Configuration conf = new BaseConfiguration();
+ conf.setProperty("gremlin.tinkergraph.defaultVertexPropertyCardinality", "list");
+ final TinkerGraph graph = TinkerGraph.open(conf);
final int len = input.readInt();
final byte[] bytes = input.readBytes(len);
try (final ByteArrayInputStream stream = new ByteArrayInputStream(bytes)) {
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
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/a4bff0c3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4bff0c3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4bff0c3
Branch: refs/heads/master
Commit: a4bff0c34bb38f772035e608a878654763d7e097
Parents: 59d0a69 ab2ca16
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Dec 29 06:29:28 2016 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Dec 29 06:29:28 2016 -0500
----------------------------------------------------------------------
.../gremlin/tinkergraph/structure/TinkerIoRegistryV2d0.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------