Merge branch 'TINKERPOP-1654-tp32' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b6ad3c2 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b6ad3c2 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b6ad3c2 Branch: refs/heads/tp32 Commit: 1b6ad3c2dc04d924a747560bded3fed8d22fa473 Parents: 0f5ca93 ad268ef Author: Stephen Mallette <[email protected]> Authored: Wed Mar 29 10:11:40 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Wed Mar 29 10:11:40 2017 -0400 ---------------------------------------------------------------------- .../structure/io/graphson/GraphSONTypeDeserializer.java | 2 +- .../gremlin/structure/io/graphson/GraphSONTypeIdResolver.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
