Updated Branches: refs/heads/cassandra-1.1 37067495c -> 32135741b refs/heads/cassandra-1.2 2721958a4 -> 1d82d190f refs/heads/cassandra-1.2.0 b86f75dcd -> 08024b3ad refs/heads/trunk 6a5c9ed87 -> 805d02808
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/805d0280 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/805d0280 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/805d0280 Branch: refs/heads/trunk Commit: 805d02808854f9e398274a08d36626b8baf6aa36 Parents: 6a5c9ed 1d82d19 Author: Brandon Williams <[email protected]> Authored: Mon Dec 3 14:32:37 2012 -0600 Committer: Brandon Williams <[email protected]> Committed: Mon Dec 3 14:32:37 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 9 ++- build.xml | 2 +- debian/changelog | 6 +- .../org/apache/cassandra/dht/RangeStreamer.java | 77 +++------------ 4 files changed, 26 insertions(+), 68 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/805d0280/CHANGES.txt ----------------------------------------------------------------------
