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 2018/09/18 16:48:43 UTC
[25/50] [abbrv] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33'
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/780e2ee5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/780e2ee5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/780e2ee5
Branch: refs/heads/TINKERPOP-1913
Commit: 780e2ee59fe4dba3aa3efbfcf2f1a89507d3aed8
Parents: e914a67 e481ced
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 13 06:50:53 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 13 06:50:53 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/780e2ee5/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/780e2ee5/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 39e0cb4,459c04f..7af3766
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -404,9 -384,6 +405,9 @@@ public enum GryoVersion
"org.apache.tinkerpop.gremlin.driver.ser.RequestMessageGryoSerializer", 167);
tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.driver.message.ResponseMessage",
"org.apache.tinkerpop.gremlin.driver.ser.ResponseMessageGryoSerializer", 169);
+
+ tryAddDynamicType(this, "org.apache.tinkerpop.gremlin.sparql.process.traversal.strategy.SparqlStrategy",
- null, 184); // ***LAST ID***
++ null, 184);
}};
}