Updated Branches: refs/heads/trunk 4e17ac469 -> de594860f
Merge branch 'cassandra-1.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de594860 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de594860 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/de594860 Branch: refs/heads/trunk Commit: de594860ff596e998bb35a5718d4ecd20df9ad2f Parents: 4e17ac4 23c458a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Mar 13 15:19:11 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Mar 13 15:19:11 2012 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 26 +++++++++++--- 1 files changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/de594860/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
