Updated Branches: refs/heads/cassandra-1.1 5f43a6950 -> e45bdb8b6
merge from 1.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e45bdb8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e45bdb8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e45bdb8b Branch: refs/heads/cassandra-1.1 Commit: e45bdb8b66588277f208681f9b6aa663fccaeb96 Parents: 5f43a69 b2b8a53 Author: Pavel Yaskevich <xe...@apache.org> Authored: Mon Feb 27 20:01:03 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Mon Feb 27 20:01:03 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/e45bdb8b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index c8ccc24,cd05765..2cc8c52 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -10,7 -9,7 +10,8 @@@ * Remove deprecated merge_shard_chance (CASSANDRA-3940) * add a convenient way to reset a node's schema (CASSANDRA-2963) * fix for intermittent SchemaDisagreementException (CASSANDRA-3884) + * CLI `list <CF>` to limit number of columns and their order (CASSANDRA-3012) + * ignore deprecated KsDef/CfDef/ColumnDef fields in native schema (CASSANDRA-3963) Merged from 1.0: * remove the wait on hint future during write (CASSANDRA-3870) * (cqlsh) ignore missing CfDef opts (CASSANDRA-3933) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e45bdb8b/src/java/org/apache/cassandra/config/KSMetaData.java ----------------------------------------------------------------------