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/d013a895 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d013a895 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d013a895 Branch: refs/heads/trunk Commit: d013a895299ca695a2fe4fe571363efbf2700066 Parents: c2ee6ba 80a141c Author: Benedict Elliott Smith <[email protected]> Authored: Tue Sep 1 14:15:39 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Tue Sep 1 14:15:39 2015 +0100 ---------------------------------------------------------------------- .../apache/cassandra/db/rows/EncodingStats.java | 17 +---------------- .../cassandra/db/rows/UnfilteredSerializer.java | 4 ++-- 2 files changed, 3 insertions(+), 18 deletions(-) ----------------------------------------------------------------------
