Updated Branches: refs/heads/trunk f1e127d92 -> c3237e474
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/c3237e47 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3237e47 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3237e47 Branch: refs/heads/trunk Commit: c3237e474a6a3957e6f0a938af7824b594e5ab53 Parents: f1e127d 6c70b83 Author: Pavel Yaskevich <xe...@apache.org> Authored: Wed Feb 8 21:19:32 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Wed Feb 8 21:19:32 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 8 ++++++++ src/java/org/apache/cassandra/cql/CFPropDefs.java | 7 ++++++- src/java/org/apache/cassandra/cql3/CFPropDefs.java | 7 ++++++- .../io/compress/CompressionParameters.java | 2 +- 5 files changed, 22 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
