Updated Branches: refs/heads/trunk 2548ab590 -> 191c96f1d
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/191c96f1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/191c96f1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/191c96f1 Branch: refs/heads/trunk Commit: 191c96f1daef918ba17c3c35c14eed3cedc8ba17 Parents: 2548ab5 e6e846c Author: Vijay Parthasarathy <vijay2...@gmail.com> Authored: Tue Nov 13 10:45:59 2012 -0800 Committer: Vijay Parthasarathy <vijay2...@gmail.com> Committed: Tue Nov 13 10:45:59 2012 -0800 ---------------------------------------------------------------------- .../cassandra/cache/ConcurrentLinkedHashCache.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
