Updated Branches: refs/heads/cassandra-1.1 e400d0eca -> 9d7ba39cb refs/heads/trunk 1b8c47524 -> d55408d97
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d55408d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d55408d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d55408d9 Branch: refs/heads/trunk Commit: d55408d977453f172638753ab004dc7a620080d4 Parents: 2bcbec0 Author: Jonathan Ellis <[email protected]> Authored: Thu Oct 18 17:44:53 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Oct 18 17:44:53 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d55408d9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 87bff33..f15e198 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -31,6 +31,12 @@ * Fix potential NPE during CFS reload (CASSANDRA-4786) * Composite indexes may miss results (CASSANDRA-4796) * Move consistency level to the protocol level (CASSANDRA-4734, 4824) +Merged from 1.1: + * allow JdbcDate to compose null Date objects (CASSANDRA-4830) + * fix possible stackoverflow when compacting 1000s of sstables + (CASSANDRA-4765) + * fix wrong leveled compaction progress calculation (CASSANDRA-4807) + * add a close() method to CRAR to prevent leaking file descriptors (CASSANDRA-4820) 1.2-beta1 @@ -101,13 +107,6 @@ * (cql3) Fix queries using LIMIT missing results (CASSANDRA-4579) * fix cross-version gossip messaging (CASSANDRA-4576) -1.1.7 - * allow JdbcDate to compose null Date objects (CASSANDRA-4830) - * fix possible stackoverflow when compacting 1000s of sstables - (CASSANDRA-4765) - * fix wrong leveled compaction progress calculation (CASSANDRA-4807) - * add a close() method to CRAR to prevent leaking file descriptors (CASSANDRA-4820) - 1.1.6 * Wait for writes on synchronous read digest mismatch (CASSANDRA-4792) * fix commitlog replay for nanotime-infected sstables (CASSANDRA-4782)
