Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9e2990d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9e2990d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9e2990d Branch: refs/heads/trunk Commit: f9e2990d54894382380d7f11c8a391b82e4c6d28 Parents: 6581abf e06d74e Author: Jonathan Ellis <[email protected]> Authored: Wed May 21 13:25:25 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed May 21 13:25:25 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/AbstractNativeCell.java | 5 +++-- src/java/org/apache/cassandra/db/NativeCounterCell.java | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
