Merge branch 'cassandra-2.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/d5e32da4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5e32da4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5e32da4 Branch: refs/heads/trunk Commit: d5e32da4e0b336e9a2e0d70995d25d01e876bbec Parents: 144ee9a 91fa467 Author: Jonathan Ellis <[email protected]> Authored: Fri Nov 1 11:34:42 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Nov 1 11:34:42 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cache/IRowCacheEntry.java | 2 +- src/java/org/apache/cassandra/db/ColumnFamily.java | 5 ----- test/unit/org/apache/cassandra/cache/CacheProviderTest.java | 9 --------- 3 files changed, 1 insertion(+), 15 deletions(-) ----------------------------------------------------------------------
