cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [1/4] git commit: Merge branch 'cassandra-1.2.0' into cassandra-1.2
Date Tue, 13 Nov 2012 07:58:10 GMT
Updated Branches:
  refs/heads/cassandra-1.2 de7aed52c -> 489355d36


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/489355d3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/489355d3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/489355d3

Branch: refs/heads/cassandra-1.2
Commit: 489355d3688cc0321828ac89e4d9f045585cc5a9
Parents: de7aed5 76613ee
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Nov 13 08:57:58 2012 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Nov 13 08:57:58 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/489355d3/CHANGES.txt
----------------------------------------------------------------------


Mime
View raw message