Updated Branches: refs/heads/cassandra-1.2 794623441 -> b9ded6456
Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9ded645 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9ded645 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9ded645 Branch: refs/heads/cassandra-1.2 Commit: b9ded64567eb059d96b9b29ca921eed383577b8d Parents: dc94f37 7946234 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 9 11:18:54 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 9 11:18:54 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 8 +- NEWS.txt | 3 +- build.xml | 4 +- src/java/org/apache/cassandra/gms/Gossiper.java | 5 + .../io/compress/CompressedRandomAccessReader.java | 74 ++---- .../cassandra/service/AntiEntropyService.java | 10 + .../apache/cassandra/service/StorageService.java | 176 +++++++++------ .../cassandra/service/StorageServiceMBean.java | 16 ++- src/java/org/apache/cassandra/tools/NodeCmd.java | 28 +-- src/java/org/apache/cassandra/tools/NodeProbe.java | 73 ++++++ 10 files changed, 258 insertions(+), 139 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9ded645/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 3567362,9a00105..f8609bc --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -24,9 -23,13 +23,14 @@@ * Ensure CL guarantees on digest mismatch (CASSANDRA-5113) * Validate correctly selects on composite partition key (CASSANDRA-5122) * Fix exception when adding collection (CASSANDRA-5117) + * Handle states for non-vnode clusters correctly (CASSANDRA-5127) + * Refuse unrecognized replication strategy options (CASSANDRA-4795) Merged from 1.1: + * Simplify CompressedRandomAccessReader to work around JDK FD bug (CASSANDRA-5088) + * Improve handling a changing target throttle rate mid-compaction (CASSANDRA-5087) * Pig: correctly decode row keys in widerow mode (CASSANDRA-5098) + * nodetool repair command now prints progress (CASSANDRA-4767) + * Ensure Jackson dependency matches lib (CASSANDRA-5126) 1.2.0
