Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f63fafbf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f63fafbf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f63fafbf Branch: refs/heads/trunk Commit: f63fafbfa2fefabb8c71643ba096255f7c03056c Parents: e531464 9ef8815 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Tue Mar 25 00:32:06 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Tue Mar 25 00:32:06 2014 -0400 ---------------------------------------------------------------------- .../apache/cassandra/dht/AbstractByteOrderedPartitioner.java | 2 +- .../org/apache/cassandra/dht/OrderPreservingPartitioner.java | 2 +- src/java/org/apache/cassandra/service/StorageService.java | 6 +++--- src/java/org/apache/cassandra/thrift/CassandraServer.java | 2 +- test/unit/org/apache/cassandra/db/KeyCollisionTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f63fafbf/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
