Updated Branches: refs/heads/trunk 85cd442e7 -> 147ff63fa
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/147ff63f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/147ff63f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/147ff63f Branch: refs/heads/trunk Commit: 147ff63fa51db228020d6cb7624f73385a5ebb0b Parents: 85cd442 30c5b81 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 13 09:06:03 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 13 09:06:03 2012 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 1 + src/java/org/apache/cassandra/db/SystemTable.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------