merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88e3977c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88e3977c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88e3977c Branch: refs/heads/trunk Commit: 88e3977ce40a46ef8e04dff52557c9c0496e1bf5 Parents: fc1a720 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Sep 17 17:17:49 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Sep 17 17:17:49 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/88e3977c/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c2a55df..46e1b43 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.1 + * add file_cache_size_in_mb setting (CASSANDRA-5661) * Improve error message when yaml contains invalid properties (CASSANDRA-5958) * Improve leveled compaction's ability to find non-overlapping L0 compactions to work on concurrently (CASSANDRA-5921) @@ -20,7 +21,6 @@ * Fix potential AssertionError during tracing (CASSANDRA-6041) * Fix NPE in sstablesplit (CASSANDRA-6027) Merged from 1.2: - * add file_cache_size_in_mb setting (CASSANDRA-5661) * Tuning knobs for dealing with large blobs and many CFs (CASSANDRA-5982) * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002) * Fix possible divide-by-zero in HHOM (CASSANDRA-5990)
