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/15e0814c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15e0814c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/15e0814c Branch: refs/heads/trunk Commit: 15e0814c5b9aad8a5df01f01eddd32055ab0941a Parents: 0722837 2a77695 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed May 14 20:45:57 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed May 14 20:45:57 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../SimpleAbstractColumnIterator.java | 29 ------- .../apache/cassandra/db/context/IContext.java | 75 ---------------- .../cassandra/gms/IFailureNotification.java | 27 ------ .../service/PendingRangeCalculatorService.java | 2 +- .../PendingRangeCalculatorServiceMBean.java | 23 ----- .../apache/cassandra/thrift/RequestType.java | 24 ------ .../cassandra/utils/AtomicLongArrayUpdater.java | 91 -------------------- .../apache/cassandra/utils/DefaultDouble.java | 46 ---------- .../apache/cassandra/utils/LatencyTracker.java | 82 ------------------ .../cassandra/utils/SkipNullRepresenter.java | 40 --------- 11 files changed, 2 insertions(+), 438 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15e0814c/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/15e0814c/src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java ----------------------------------------------------------------------
