Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6e846c1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6e846c1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6e846c1 Branch: refs/heads/trunk Commit: e6e846c134da0740a5e6844c4933d131d43c36e3 Parents: 9a2ea9a 94fa825 Author: Vijay Parthasarathy <[email protected]> Authored: Tue Nov 13 10:45:05 2012 -0800 Committer: Vijay Parthasarathy <[email protected]> Committed: Tue Nov 13 10:45:05 2012 -0800 ---------------------------------------------------------------------- .../cassandra/cache/ConcurrentLinkedHashCache.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
