Updated Branches: refs/heads/cassandra-1.1 073038c84 -> 23c458aaa
Merge branch 'cassandra-1.1.0' into cassandra-1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/23c458aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/23c458aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/23c458aa Branch: refs/heads/cassandra-1.1 Commit: 23c458aaad827321ea13258fcc6c750de2467ef8 Parents: 073038c 23dd8c9 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 13 15:18:06 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 13 15:18:06 2012 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 26 +++++++++++--- 1 files changed, 20 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
