You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/01/08 15:29:31 UTC
[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
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/3ad60906
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ad60906
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ad60906
Branch: refs/heads/trunk
Commit: 3ad6090623d1bb146005c5325abc3a513b547dc1
Parents: 87d80b4 9c1679d
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Jan 8 15:26:09 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri Jan 8 15:26:09 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/dht/Range.java | 21 +
.../apache/cassandra/locator/TokenMetadata.java | 34 +-
test/unit/org/apache/cassandra/Util.java | 4 +-
.../org/apache/cassandra/dht/RangeTest.java | 55 ++
.../org/apache/cassandra/service/MoveTest.java | 496 ++++++++++++++++++-
6 files changed, 581 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ad60906/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8aab604,1e7f4ed..92493d7
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,7 -21,12 +52,8 @@@ Merged from 2.2
* (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:
+ * Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
* Fix binding to any address in CqlBulkRecordWriter (CASSANDRA-9309)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ad60906/src/java/org/apache/cassandra/dht/Range.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ad60906/src/java/org/apache/cassandra/locator/TokenMetadata.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ad60906/test/unit/org/apache/cassandra/Util.java
----------------------------------------------------------------------