Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9f06a3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9f06a3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9f06a3b Branch: refs/heads/trunk Commit: d9f06a3be095a6576974533d921a14819e43a91e Parents: c06ba25 2269adb Author: Sylvain Lebresne <[email protected]> Authored: Wed Apr 30 11:36:04 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Apr 30 11:36:04 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 45 +++++++++++++++++--- .../cassandra/thrift/CassandraServer.java | 3 +- .../unit/org/apache/cassandra/SchemaLoader.java | 16 ++++++- .../apache/cassandra/config/CFMetaDataTest.java | 5 ++- 5 files changed, 60 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f06a3b/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f06a3b/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9f06a3b/src/java/org/apache/cassandra/thrift/CassandraServer.java ----------------------------------------------------------------------
