Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7b398c52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7b398c52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7b398c52 Branch: refs/heads/trunk Commit: 7b398c52d52577c7d5c9537e862655b369098a84 Parents: e3dd88a 453a074 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri May 9 19:51:25 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri May 9 19:51:25 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlPagingRecordReader.java | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b398c52/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 622d381,32bd539..e307843 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -19,6 -8,25 +19,7 @@@ Merged from 2.0 * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088) * cqlsh can't tab-complete disabling compaction (CASSANDRA-7185) * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172) + * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198) - - -2.0.8 - * Correctly delete scheduled range xfers (CASSANDRA-7143) - * Make batchlog replica selection rack-aware (CASSANDRA-6551) - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072) - * Set JMX RMI port to 7199 (CASSANDRA-7087) - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939) - * Log a warning for large batches (CASSANDRA-6487) - * Queries on compact tables can return more rows that requested (CASSANDRA-7052) - * USING TIMESTAMP for batches does not work (CASSANDRA-7053) - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) - * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073) - * Re-add parameter columns to tracing session (CASSANDRA-6942) - * Fix writetime/ttl functions for static columns (CASSANDRA-7081) - * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142) Merged from 1.2: * Add Cloudstack snitch (CASSANDRA-7147) * Update system.peers correctly when relocating tokens (CASSANDRA-7126) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7b398c52/src/java/org/apache/cassandra/hadoop/cql3/CqlPagingRecordReader.java ----------------------------------------------------------------------
