Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a4b8f10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a4b8f10 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a4b8f10 Branch: refs/heads/trunk Commit: 2a4b8f10e9fe00dadebaebb9372ff15f7cc8c873 Parents: 4effabc 454f32d Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Nov 5 13:03:16 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Nov 5 13:03:16 2015 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/schema/Types.java | 2 +- .../utils/NativeSSTableLoaderClient.java | 54 +++++++++++++++----- 2 files changed, 42 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
