Updated Branches: refs/heads/cassandra-1.0 6173fa9e3 -> 505e196d4
fix CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/505e196d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/505e196d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/505e196d Branch: refs/heads/cassandra-1.0 Commit: 505e196d435baf25c62194cf8a5cded16a6302ec Parents: 6173fa9 Author: Pavel Yaskevich <xe...@apache.org> Authored: Wed Feb 1 00:51:53 2012 +0200 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Wed Feb 1 00:52:10 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/505e196d/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 468dbcf..078de4f 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -10,6 +10,9 @@ readability (CASSANDRA-3726) * synchronize BiMap of bootstrapping tokens (CASSANDRA-3417) * show index options in CLI (CASSANDRA-3809) +Merged from 0.8: + * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily + case (CASSANDRA-3251) 1.0.7 @@ -54,8 +57,7 @@ Merged from 0.8: * use correct list of replicas for LOCAL_QUORUM reads when read repair is disabled (CASSANDRA-3696) * block on flush before compacting hints (may prevent OOM) (CASSANDRA-3733) - * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily - case (CASSANDRA-3251) + 1.0.6 * (CQL) fix cqlsh support for replicate_on_write (CASSANDRA-3596)