Updated Branches: refs/heads/trunk 11965bca1 -> 1bd40539e
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/1bd40539 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bd40539 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bd40539 Branch: refs/heads/trunk Commit: 1bd40539ee318b453532663fa47812ebab800b0c Parents: 11965bc 25565b6 Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Feb 28 01:24:11 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Feb 28 01:24:11 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + interface/cassandra.thrift | 28 +- .../org/apache/cassandra/thrift/CfDef.java | 1030 ++++++++++++++- .../org/apache/cassandra/thrift/Constants.java | 2 +- .../org/apache/cassandra/thrift/KsDef.java | 106 ++- 5 files changed, 1161 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
