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/5233948d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5233948d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5233948d Branch: refs/heads/trunk Commit: 5233948d124824edd8483a649aa6fec82f2259b1 Parents: 7879b2f ea68619 Author: Aleksey Yeschenko <[email protected]> Authored: Fri Aug 15 22:21:14 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Fri Aug 15 22:21:14 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 10 +++------- src/java/org/apache/cassandra/service/CacheService.java | 11 +++++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5233948d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5233948d/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ----------------------------------------------------------------------
