cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zzn...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Fri, 21 Oct 2016 02:27:51 GMT
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: 42da0eaf247c48b083a464cdf4dac676d0fac84a
Parents: 4d34032 ddb3e6a
Author: Nate McCall <zznate.m@gmail.com>
Authored: Fri Oct 21 15:25:28 2016 +1300
Committer: Nate McCall <zznate.m@gmail.com>
Committed: Fri Oct 21 15:26:41 2016 +1300

----------------------------------------------------------------------
 CHANGES.txt                                                       | 3 +++
 .../apache/cassandra/io/sstable/format/big/BigTableWriter.java    | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/42da0eaf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e63b23b,13653b7..1e9bc7d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,3 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
++Merged from 3.0:
++ * Include SSTable filename in compacting large row message (CASSANDRA-12384)
 +
  3.10
   * Fix RandomReplicationAwareTokenAllocatorTest.testExistingCluster (CASSANDRA-12812)
   * Upgrade commons-codec to 1.9 (CASSANDRA-12790)
@@@ -93,8 -86,9 +95,9 @@@
   * Remove pre-startup check for open JMX port (CASSANDRA-12074)
   * Remove compaction Severity from DynamicEndpointSnitch (CASSANDRA-11738)
   * Restore resumable hints delivery (CASSANDRA-11960)
 - * Properly report LWT contention (CASSANDRA-12626)
 + * Properly record CAS contention (CASSANDRA-12626)
  Merged from 3.0:
+  * Include SSTable filename in compacting large row message (CASSANDRA-12384)
   * Fix potential socket leak (CASSANDRA-12329, CASSANDRA-12330)
   * Fix ViewTest.testCompaction (CASSANDRA-12789)
   * Improve avg aggregate functions (CASSANDRA-12417)


Mime
View raw message