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/a4a059cb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4a059cb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4a059cb Branch: refs/heads/TINKERPOP-1130 Commit: a4a059cb84c853c97a955a529f7294ed4a8b1125 Parents: 104b8d7 49668ce Author: Stephen Mallette <[email protected]> Authored: Tue Dec 20 13:50:32 2016 -0500 Committer: Stephen Mallette <[email protected]> Committed: Tue Dec 20 13:50:32 2016 -0500 ---------------------------------------------------------------------- .../structure/io/gryo/kryoshim/InputShim.java | 2 ++ .../structure/io/gryo/kryoshim/OutputShim.java | 2 ++ .../kryoshim/shaded/ShadedInputAdapter.java | 5 +++ .../kryoshim/shaded/ShadedOutputAdapter.java | 8 +++-- .../io/gryo/IoRegistryAwareKryoSerializer.java | 6 ---- .../kryoshim/unshaded/UnshadedInputAdapter.java | 32 +++++++----------- .../kryoshim/unshaded/UnshadedKryoAdapter.java | 30 +++++------------ .../unshaded/UnshadedKryoShimService.java | 6 ---- .../unshaded/UnshadedOutputAdapter.java | 35 ++++++++------------ .../unshaded/UnshadedSerializerAdapter.java | 9 +---- 10 files changed, 49 insertions(+), 86 deletions(-) ----------------------------------------------------------------------
