Updated Branches: refs/heads/trunk 46689d88d -> 85cd442e7
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/85cd442e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/85cd442e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/85cd442e Branch: refs/heads/trunk Commit: 85cd442e7e8e661d41942e10cc85a07e94b20f7d Parents: 46689d8 489355d Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 13 08:58:19 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 13 08:58:19 2012 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/CollationController.java | 33 +++++++-------- src/java/org/apache/cassandra/db/DataTracker.java | 31 ++++++-------- .../cassandra/db/CollationControllerTest.java | 20 +++++---- 4 files changed, 41 insertions(+), 44 deletions(-) ----------------------------------------------------------------------
