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/38d1fced Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/38d1fced Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/38d1fced Branch: refs/heads/trunk Commit: 38d1fced1a0e0a8aea5ec1c9dd36ae860a3c696f Parents: 645fa06 cf365e3 Author: Sam Tunnicliffe <[email protected]> Authored: Fri Oct 9 11:37:05 2015 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Fri Oct 9 11:37:05 2015 +0100 ---------------------------------------------------------------------- .../apache/cassandra/thrift/ThriftConversion.java | 2 +- .../apache/cassandra/config/CFMetaDataTest.java | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
