Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe4606ce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe4606ce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe4606ce Branch: refs/heads/trunk Commit: fe4606ce17561cabb827331d81bca5f15602805b Parents: 65166aa 7ce28f8 Author: Dave Brosius <dbros...@apache.org> Authored: Sat Sep 21 16:10:19 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sat Sep 21 16:10:19 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/FileCacheService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
