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/9b6aabef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b6aabef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b6aabef Branch: refs/heads/trunk Commit: 9b6aabef5dfff44e9e80375851b0853af244c9fa Parents: 189d51f 6e6863d Author: Dave Brosius <[email protected]> Authored: Thu Mar 27 22:29:54 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Thu Mar 27 22:29:54 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/CacheService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
