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

Branch: refs/heads/trunk
Commit: 85b0d150fb5cf7892eafd6f090cc176e3634a0af
Parents: bf2ee04 591b8ca
Author: Marcus Eriksson <[email protected]>
Authored: Thu Apr 25 18:16:39 2013 +0200
Committer: Marcus Eriksson <[email protected]>
Committed: Thu Apr 25 18:16:39 2013 +0200

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/SchemaLoader.java   |    3 +
 .../LegacyLeveledManifestTestHelper.java           |   57 +++++++++++++++
 2 files changed, 60 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


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

Reply via email to