Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f2528422 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2528422 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2528422 Branch: refs/heads/trunk Commit: f25284220ca2ba0bd28e753b4a1d554e468b85b0 Parents: de2495c 45310c0 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Dec 19 15:06:30 2012 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Dec 19 15:06:30 2012 -0600 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ .../dht/OrderPreservingPartitionerTest.java | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
