Updated Branches: refs/heads/trunk fe507e305 -> e571ec2c6
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/e571ec2c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e571ec2c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e571ec2c Branch: refs/heads/trunk Commit: e571ec2c6fe0a18d5c88671e2a560c199ef93eea Parents: fe507e3 11bdcd6 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Mar 22 16:54:53 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Mar 22 16:54:53 2012 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 11 ++++++++++- .../apache/cassandra/config/ColumnDefinition.java | 5 +++++ 2 files changed, 15 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e571ec2c/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e571ec2c/src/java/org/apache/cassandra/config/ColumnDefinition.java ----------------------------------------------------------------------
