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/e9061922 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9061922 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9061922 Branch: refs/heads/cassandra-2.1 Commit: e9061922da418930dd1d607da7f2499dc067bac2 Parents: 49d5c8d e4fc395 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Jan 9 19:58:44 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Jan 9 19:58:44 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 +- src/java/org/apache/cassandra/net/MessageOut.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9061922/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index abe3fce,fc43dfa..55ca55d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -96,36 -44,7 +96,36 @@@ Merged from 2.0 * Avoid overlap in L1 when L0 contains many nonoverlapping sstables (CASSANDRA-8211) * Improve PropertyFileSnitch logging (CASSANDRA-8183) - * Abort liveRatio calculation if the memtable is flushed (CASSANDRA-8164) + * Add DC-aware sequential repair (CASSANDRA-8193) + * Use live sstables in snapshot repair if possible (CASSANDRA-8312) - ++ * Fix hints serialized size calculation (CASSANDRA-8587) + +2.1.2 + * (cqlsh) parse_for_table_meta errors out on queries with undefined + grammars (CASSANDRA-8262) + * (cqlsh) Fix SELECT ... TOKEN() function broken in C* 2.1.1 (CASSANDRA-8258) + * Fix Cassandra crash when running on JDK8 update 40 (CASSANDRA-8209) + * Optimize partitioner tokens (CASSANDRA-8230) + * Improve compaction of repaired/unrepaired sstables (CASSANDRA-8004) + * Make cache serializers pluggable (CASSANDRA-8096) + * Fix issues with CONTAINS (KEY) queries on secondary indexes + (CASSANDRA-8147) + * Fix read-rate tracking of sstables for some queries (CASSANDRA-8239) + * Fix default timestamp in QueryOptions (CASSANDRA-8246) + * Set socket timeout when reading remote version (CASSANDRA-8188) + * Refactor how we track live size (CASSANDRA-7852) + * Make sure unfinished compaction files are removed (CASSANDRA-8124) + * Fix shutdown when run as Windows service (CASSANDRA-8136) + * Fix DESCRIBE TABLE with custom indexes (CASSANDRA-8031) + * Fix race in RecoveryManagerTest (CASSANDRA-8176) + * Avoid IllegalArgumentException while sorting sstables in + IndexSummaryManager (CASSANDRA-8182) + * Shutdown JVM on file descriptor exhaustion (CASSANDRA-7579) + * Add 'die' policy for commit log and disk failure (CASSANDRA-7927) + * Fix installing as service on Windows (CASSANDRA-8115) + * Fix CREATE TABLE for CQL2 (CASSANDRA-8144) + * Avoid boxing in ColumnStats min/max trackers (CASSANDRA-8109) +Merged from 2.0: * Correctly handle non-text column names in cql3 (CASSANDRA-8178) * Fix deletion for indexes on primary key columns (CASSANDRA-8206) * Add 'nodetool statusgossip' (CASSANDRA-8125) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9061922/src/java/org/apache/cassandra/net/MessageOut.java ----------------------------------------------------------------------