Merge branch 'cassandra-1.2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/228d1cf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/228d1cf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/228d1cf6 Branch: refs/heads/trunk Commit: 228d1cf6ebdf6343121f1c95c862b2dfcc4e233a Parents: 91a10fa 94fa825 Author: Sylvain Lebresne <[email protected]> Authored: Tue Nov 13 20:11:01 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Tue Nov 13 20:11:01 2012 +0100 ---------------------------------------------------------------------- .../cassandra/cache/ConcurrentLinkedHashCache.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
