Updated Branches: refs/heads/cassandra-1.1 9c5ac8ff6 -> fb7dfc914
Correct CHANGES.txt to reflect CASSANDRA-3671 correctly. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb7dfc91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb7dfc91 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fb7dfc91 Branch: refs/heads/cassandra-1.1 Commit: fb7dfc91442602370289320e5a445b0a0bdc7473 Parents: 9c5ac8f Author: Peter Schuller <[email protected]> Authored: Mon Mar 5 21:56:41 2012 -0800 Committer: Peter Schuller <[email protected]> Committed: Mon Mar 5 21:56:41 2012 -0800 ---------------------------------------------------------------------- CHANGES.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fb7dfc91/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 75123a8..42bf195 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ 1.1.1-dev * optimize commitlog checksumming (CASSANDRA-3610) * identify and blacklist corrupted SSTables from future compactions (CASSANDRA-2261) + * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671) 1.1-dev @@ -23,7 +24,6 @@ * Fix race between writes and read for cache (CASSANDRA-3862) * perform static initialization of StorageProxy on start-up (CASSANDRA-3797) * support trickling fsync() on writes (CASSANDRA-3950) - * expose counters for unavailable/timeout exceptions given to thrift clients (CASSANDRA-3671) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933)
