cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [3/6] git commit: Merge branch 'cassandra-2.0' into trunk
Date Thu, 19 Sep 2013 22:45:55 GMT
Merge branch 'cassandra-2.0' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1257868e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1257868e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1257868e

Branch: refs/heads/trunk
Commit: 1257868e33827b6e367c6dc51cca4f67f948c9ae
Parents: 6813123 e5cbde9
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Thu Sep 19 17:44:33 2013 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Thu Sep 19 17:44:33 2013 -0500

----------------------------------------------------------------------
 .../cassandra/db/CollationController.java       | 32 ++-------
 .../unit/org/apache/cassandra/SchemaLoader.java |  1 +
 .../cassandra/db/CollationControllerTest.java   | 73 +++++++++++++++-----
 3 files changed, 63 insertions(+), 43 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1257868e/test/unit/org/apache/cassandra/SchemaLoader.java
----------------------------------------------------------------------


Mime
View raw message