cassandra-commits mailing list archives

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


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

Branch: refs/heads/cassandra-3.3
Commit: 91d7bed558dcd0e67a5f45b07f29af68ad1a55f0
Parents: d2c41b1 a942b2c
Author: Carl Yeksigian <carl@apache.org>
Authored: Tue Jan 12 12:28:09 2016 -0500
Committer: Carl Yeksigian <carl@apache.org>
Committed: Tue Jan 12 12:30:31 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     | 20 ++++++++++++--------
 .../io/sstable/format/SSTableReader.java        | 10 +++++++++-
 2 files changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91d7bed5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 50dc106,b916fa6..a301b0f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -5,14 -4,6 +5,26 @@@ Merged from 3.0
     tombstone (CASSANDRA-10743)
   * MV should use the maximum timestamp of the primary key (CASSANDRA-10910)
   * Fix potential assertion error during compaction (CASSANDRA-10944)
++Merged from 2.2:
++ * 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)
++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-8708)
++
 +
 +3.2
 + * Make sure tokens don't exist in several data directories (CASSANDRA-6696)
 + * Add requireAuthorization method to IAuthorizer (CASSANDRA-10852)
 + * Move static JVM options to conf/jvm.options file (CASSANDRA-10494)
 + * Fix CassandraVersion to accept x.y version string (CASSANDRA-10931)
 + * Add forceUserDefinedCleanup to allow more flexible cleanup (CASSANDRA-10708)
 + * (cqlsh) allow setting TTL with COPY (CASSANDRA-9494)
   * Fix counting of received sstables in streaming (CASSANDRA-10949)
   * Implement hints compression (CASSANDRA-9428)
   * Fix potential assertion error when reading static columns (CASSANDRA-10903)
@@@ -46,19 -15,24 +58,11 @@@ Merged from 3.0
   * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-10837)
   * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806)
  Merged from 2.2:
-- * 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)
   * (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)
   * cqlsh fails to decode utf-8 characters for text typed columns (CASSANDRA-10875)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/91d7bed5/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java
----------------------------------------------------------------------


Mime
View raw message