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/5c107171 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5c107171 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5c107171 Branch: refs/heads/master Commit: 5c10717188af8281a6f3c0df4a13825eecbe4316 Parents: a9562a3 1b6ad3c Author: Stephen Mallette <[email protected]> Authored: Wed Mar 29 10:11:57 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed Mar 29 10:11:57 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../structure/io/graphson/GraphSONTypeDeserializer.java | 2 +- .../gremlin/structure/io/graphson/GraphSONTypeIdResolver.java | 7 +------ gremlin-shaded/pom.xml | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c107171/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5c107171/gremlin-shaded/pom.xml ----------------------------------------------------------------------
