Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8873afc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8873afc4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8873afc4 Branch: refs/heads/trunk Commit: 8873afc481f5f315f00fae6efa3854135f16b7b9 Parents: 4082e53 346d8fb Author: Jonathan Ellis <[email protected]> Authored: Wed Mar 12 10:04:52 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Mar 12 10:04:52 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 + pylib/cqlshlib/cql3handling.py | 13 +- .../apache/cassandra/cache/CachingOptions.java | 288 +++++++++++++++++++ .../org/apache/cassandra/cli/CliClient.java | 3 +- .../org/apache/cassandra/config/CFMetaData.java | 110 ++----- .../cassandra/cql3/statements/CFPropDefs.java | 25 +- .../apache/cassandra/db/ColumnFamilyStore.java | 18 +- .../org/apache/cassandra/db/SystemKeyspace.java | 33 ++- .../cassandra/io/sstable/SSTableReader.java | 6 +- .../unit/org/apache/cassandra/SchemaLoader.java | 14 +- 10 files changed, 388 insertions(+), 124 deletions(-) ----------------------------------------------------------------------
