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/a03ac8d0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a03ac8d0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a03ac8d0 Branch: refs/heads/trunk Commit: a03ac8d07f04328427020a5dbe68545cf264ce47 Parents: 5023486 ad5169d Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Mar 12 15:08:55 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Mar 12 15:08:55 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/FileCacheService.java | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a03ac8d0/CHANGES.txt ----------------------------------------------------------------------
