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/bc6ea03d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc6ea03d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc6ea03d Branch: refs/heads/trunk Commit: bc6ea03d10ccdb8fd49315900d50264a67ecde8d Parents: 6bd0f7a 21191e6 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Dec 28 08:25:13 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Dec 28 08:25:13 2015 -0500 ---------------------------------------------------------------------- .../apache/cassandra/thrift/ThriftResultsMerger.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
