cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c...@apache.org
Subject [11/19] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Date Tue, 12 Jan 2016 17:32:12 GMT
Merge branch 'cassandra-2.1' into cassandra-2.2


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a6e5cdae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6e5cdae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a6e5cdae

Branch: refs/heads/cassandra-3.0
Commit: a6e5cdaefc034fcd3069bc0db5bed40fce91aafe
Parents: e8bd8a4 10bbcfc
Author: Carl Yeksigian <carl@apache.org>
Authored: Tue Jan 12 12:27:24 2016 -0500
Committer: Carl Yeksigian <carl@apache.org>
Committed: Tue Jan 12 12:27:24 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                               |  3 ++-
 .../apache/cassandra/io/sstable/format/SSTableReader.java | 10 +++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/a6e5cdae/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 50d5f60,6f567ee..477a104
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,24 -1,11 +1,25 @@@
 -2.1.13
 +2.2.5
 + * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
 + * Enable GC logging by default (CASSANDRA-10140)
 + * Optimize pending range computation (CASSANDRA-9258)
 + * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
 + * drop/alter user should be case sensitive (CASSANDRA-10817)
 + * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 + * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
 + * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 + * Add new types to Stress (CASSANDRA-9556)
 + * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 + * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 + * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 + * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 + * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 +Merged from 2.1:
+  * If CompactionMetadata is not in stats file, use index summary instead (CASSANDRA-10676)
   * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
   * Fix pending range calculation during moves (CASSANDRA-10887)
-  * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
+  * Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-8708)
   * Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
   * Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
 - * Fix the way we replace sstables after anticompaction (CASSANDRA-10831)
   * cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)
   * Log error when stream session fails (CASSANDRA-9294)
   * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)


Mime
View raw message