Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8995128 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8995128 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8995128 Branch: refs/heads/trunk Commit: a8995128374a077172eb8c57094da68ee9ff0366 Parents: e398c6b 62d9c43 Author: Dave Brosius <[email protected]> Authored: Mon Jun 2 23:36:55 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon Jun 2 23:36:55 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/FileCacheService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8995128/src/java/org/apache/cassandra/service/FileCacheService.java ----------------------------------------------------------------------
