Updated Branches: refs/heads/cassandra-1.2 7eae57aea -> a44a3d4b8 refs/heads/trunk 6a5495afe -> 011e8a060
unbork changelog entries for merges from 1.1.9 and 1.1.10 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a44a3d4b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a44a3d4b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a44a3d4b Branch: refs/heads/cassandra-1.2 Commit: a44a3d4b86135356d4ea9b50d2cd990e5f474894 Parents: 7eae57a Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Apr 29 16:55:24 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Apr 29 16:55:29 2013 -0500 ---------------------------------------------------------------------- CHANGES.txt | 35 ++++++++++++++--------------------- 1 files changed, 14 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a44a3d4b/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 241ef7c..3922cb3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -132,6 +132,12 @@ Merged from 1.1: * cqlsh: Add username autocompletion (CASSANDRA-5231) * Fix CQL3 composite partition key error (CASSANDRA-5240) * Allow IN clause on last clustering key (CASSANDRA-5230) +Merged from 1.1: + * fix start key/end token validation for wide row iteration (CASSANDRA-5168) + * add ConfigHelper support for Thrift frame and max message sizes (CASSANDRA-5188) + * fix nodetool repair not fail on node down (CASSANDRA-5203) + * always collect tombstone hints (CASSANDRA-5068) + * Fix error when sourcing file in cqlsh (CASSANDRA-5235) 1.2.1 @@ -184,35 +190,22 @@ Merged from 1.1: * Fix cf name extraction from manifest in Directories.migrateFile() (CASSANDRA-5242) * Support pluggable internode authentication (CASSANDRA-5401) * Replace mistaken usage of commons-logging with slf4j (CASSANDRA-5464) - - -1.1.10 - * fix saved key cache not loading at startup (CASSANDRA-5166) - * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170) - * fix sstable maxtimestamp for row deletes and pre-1.1.1 sstables (CASSANDRA-5153) - * fix start key/end token validation for wide row iteration (CASSANDRA-5168) - * add ConfigHelper support for Thrift frame and max message sizes (CASSANDRA-5188) - * fix nodetool repair not fail on node down (CASSANDRA-5203) - * always collect tombstone hints (CASSANDRA-5068) - * Fix thread growth on node removal (CASSANDRA-5175) - * Fix error when sourcing file in cqlsh (CASSANDRA-5235) - * Make Ec2Region's datacenter name configurable (CASSANDRA-5155) - - -1.1.9 + * Ensure Jackson dependency matches lib (CASSANDRA-5126) + * Expose droppable tombstone ratio stats over JMX (CASSANDRA-5159) +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) * fix user defined compaction to run against 1.1 data directory (CASSANDRA-5118) * Fix CQL3 BATCH authorization caching (CASSANDRA-5145) * fix get_count returns incorrect value with TTL (CASSANDRA-5099) - * better handling for amid compaction failure (CASSANDRA-5137) - * calculate pending ranges asynchronously (CASSANDRA-5135) + * better handling for mid-compaction failure (CASSANDRA-5137) * convert default marshallers list to map for better readability (CASSANDRA-5109) - * Expose droppable tombstone ratio stats over JMX (CASSANDRA-5159) - + * fix ConcurrentModificationException in getBootstrapSource (CASSANDRA-5170) + * fix sstable maxtimestamp for row deletes and pre-1.1.1 sstables (CASSANDRA-5153) + * Fix thread growth on node removal (CASSANDRA-5175) + * Make Ec2Region's datacenter name configurable (CASSANDRA-5155) 1.2.0
