You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/12/03 21:32:57 UTC
[13/21] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2.0
Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/dht/RangeStreamer.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d42e3b68
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d42e3b68
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d42e3b68
Branch: refs/heads/trunk
Commit: d42e3b68785e1904342464e6375808a44d770cde
Parents: b86f75d d1d3720
Author: Brandon Williams <br...@apache.org>
Authored: Mon Dec 3 14:23:54 2012 -0600
Committer: Brandon Williams <br...@apache.org>
Committed: Mon Dec 3 14:23:54 2012 -0600
----------------------------------------------------------------------
.../org/apache/cassandra/dht/RangeStreamer.java | 77 +++------------
1 files changed, 14 insertions(+), 63 deletions(-)
----------------------------------------------------------------------