Updated Branches: refs/heads/cassandra-1.2 de2495c2c -> f25284220 refs/heads/cassandra-1.2.0 e2715f9ea -> 45310c068 refs/heads/trunk ff92111c0 -> 1e80bb899
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/1e80bb89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e80bb89 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e80bb89 Branch: refs/heads/trunk Commit: 1e80bb89992cac590b01f0faea3c9dc6944d1ea0 Parents: ff92111 f252842 Author: Yuki Morishita <[email protected]> Authored: Wed Dec 19 15:06:43 2012 -0600 Committer: Yuki Morishita <[email protected]> Committed: Wed Dec 19 15:06:43 2012 -0600 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ .../dht/OrderPreservingPartitionerTest.java | 7 ++++++- 3 files changed, 13 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
