Updated Branches: refs/heads/trunk 8e371d82d -> c971e4c7f
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c971e4c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c971e4c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c971e4c7 Branch: refs/heads/trunk Commit: c971e4c7f0c94c8f65882e2499c7e41d9f37387e Parents: 8e371d8 e45bdb8 Author: Pavel Yaskevich <xe...@apache.org> Authored: Mon Feb 27 20:02:32 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Mon Feb 27 20:02:32 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 6 ++++++ .../apache/cassandra/config/ColumnDefinition.java | 6 ++++++ .../org/apache/cassandra/config/KSMetaData.java | 12 ++++++++++++ 4 files changed, 25 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c971e4c7/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c971e4c7/src/java/org/apache/cassandra/config/ColumnDefinition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c971e4c7/src/java/org/apache/cassandra/config/KSMetaData.java ----------------------------------------------------------------------
