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 2014/02/26 14:48:56 UTC
[2/3] git commit: Merge branch 'cassandra-2.1' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b8887975
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b8887975
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b8887975
Branch: refs/heads/cassandra-2.1
Commit: b8887975389c5d2120f369cdce6d9083aa7803d2
Parents: 74258e2 5b6d2e4
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Feb 26 14:48:21 2014 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Feb 26 14:48:21 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 3 +
debian/control | 2 +-
debian/rules | 4 +-
pylib/cqlshlib/usertypes.py | 2 +-
.../locator/DynamicEndpointSnitch.java | 25 +++--
.../cassandra/tools/SSTableMetadataViewer.java | 1 +
.../apache/cassandra/db/RangeTombstoneTest.java | 24 +++--
.../dht/OrderPreservingPartitionerTest.java | 11 +-
.../locator/DynamicEndpointSnitchTest.java | 108 ++++++++-----------
10 files changed, 92 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8887975/test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
----------------------------------------------------------------------