Updated Branches: refs/heads/trunk bffb4bdfe -> 631bc37a6
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/631bc37a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/631bc37a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/631bc37a Branch: refs/heads/trunk Commit: 631bc37a63011e2270128ea779b2f166ea8b7889 Parents: bffb4bd dcddfaf Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Jan 15 16:49:10 2013 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Jan 15 16:49:10 2013 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/SystemTableTest.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) ----------------------------------------------------------------------
