cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [13/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.5
Date Wed, 16 Mar 2016 09:52:30 GMT
Merge branch 'cassandra-3.0' into cassandra-3.5


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

Branch: refs/heads/cassandra-3.5
Commit: fc6b2b3d4bc18406e9d93bd0bf0a0f4080cf93f2
Parents: caad327 dcc57d0
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Wed Mar 16 10:49:20 2016 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Wed Mar 16 10:49:20 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                     | 1 +
 .../org/apache/cassandra/db/SinglePartitionReadCommand.java     | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc6b2b3d/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a71d4c6,87691f9..7acb24d
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -91,9 -58,9 +91,10 @@@ Merged from 2.2
   * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
   * Fix paging on DISTINCT queries repeats result when first row in partition changes
     (CASSANDRA-10010)
 + * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
   * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
  Merged from 2.1:
+  * Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
   * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
   * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
   * Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc6b2b3d/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java
----------------------------------------------------------------------


Mime
View raw message