Updated Branches: refs/heads/cassandra-1.0 cafeeebd1 -> 3509f3d35
update changes for 3733 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3509f3d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3509f3d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3509f3d3 Branch: refs/heads/cassandra-1.0 Commit: 3509f3d35d10c3e8dd7a1bdd6d3a13307462c96d Parents: cafeeeb Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Jan 12 11:22:23 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Jan 12 11:22:23 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3509f3d3/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c0f2c66..39211a4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -37,6 +37,7 @@ Merged from 0.8: when a key alias is involved (CASSANDRA-3700) * fix CLI `show schema` command insert of an extra comma in column_metadata (CASSANDRA-3714) + * block on flush before compacting hints (may prevent OOM) (CASSANDRA-3733) 1.0.6