cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Fri, 20 Nov 2015 13:54:00 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0


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

Branch: refs/heads/cassandra-3.1
Commit: 8a0615b4a7d1fa6864b95e1bb72a5417a54472e2
Parents: 039ff1f da4b971
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Nov 20 14:01:17 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Nov 20 14:01:17 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a0615b4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c3469bc,17c5047..d6f0379
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -9,7 -3,17 +9,9 @@@ Merged from 2.2
   * Fix SimpleDateType type compatibility (CASSANDRA-10027)
   * (Hadoop) fix splits calculation (CASSANDRA-10640)
   * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
 - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645)
 - * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
 - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
 - * Expose phi values from failure detector via JMX and tweak debug
 -   and trace logging (CASSANDRA-9526)
 - * Fix RangeNamesQueryPager (CASSANDRA-10509)
 - * Deprecate Pig support (CASSANDRA-10542)
 - * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
  Merged from 2.1:
+  * Try next replica if not possible to connect to primary replica on
+    ColumnFamilyRecordReader (CASSANDRA-2388)
   * Limit window size in DTCS (CASSANDRA-10280)
   * sstableloader does not use MAX_HEAP_SIZE env parameter (CASSANDRA-10188)
   * (cqlsh) Improve COPY TO performance and error handling (CASSANDRA-9304)


Mime
View raw message