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/616c019a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/616c019a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/616c019a Branch: refs/heads/trunk Commit: 616c019aea3d24ed21fcb48290cf79b7d4f60106 Parents: d660223 a899512 Author: Dave Brosius <[email protected]> Authored: Mon Jun 2 23:37:28 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Jun 2 23:37:28 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/FileCacheService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
