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/9ee4deb9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9ee4deb9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9ee4deb9 Branch: refs/heads/trunk Commit: 9ee4deb9cefe4b377cc5e5f34603d71fdf7ee2ce Parents: a9d6aef b7ef940 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Apr 15 15:46:34 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Apr 15 15:46:34 2013 -0500 ---------------------------------------------------------------------- .../apache/cassandra/cache/SerializingCache.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
