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/17afc08d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17afc08d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17afc08d Branch: refs/heads/trunk Commit: 17afc08d6eea030655784b87ebef493ede69747b Parents: b7d5f5a 361ad68 Author: Brandon Williams <[email protected]> Authored: Fri May 9 10:13:08 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri May 9 10:13:08 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/KeyCacheTest.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
