Updated Branches: refs/heads/cassandra-1.1.0 54aaa3350 -> 452495fe3
fix CHANGES Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/452495fe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/452495fe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/452495fe Branch: refs/heads/cassandra-1.1.0 Commit: 452495fe37059fce7e5d4c0a3d2c93221c5be65d Parents: 54aaa33 Author: Jonathan Ellis <[email protected]> Authored: Fri Apr 20 11:01:47 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Fri Apr 20 11:01:47 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/452495fe/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3a45611..fe728f9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,11 +6,11 @@ * Add support for CL.TWO and CL.THREE in CQL (CASSANDRA-4156) * Fix type in CQL3 ALTER TABLE preventing update (CASSANDRA-4170) * Throw invalid exception from CQL3 on obsolete options (CASSANDRA-4171) + * fix stress build (CASSANDRA-4140) + * add time remaining estimate to nodetool compactionstats (CASSANDRA-4167) Merged from 1.0: * avoid streaming empty files with bulk loader if sstablewriter errors out (CASSANDRA-3946) - * fix stress build (CASSANDRA-4140) - * add time remaining estimate to nodetool compactionstats (CASSANDRA-4167) 1.1-rc1
