Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ce04564 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ce04564 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ce04564 Branch: refs/heads/cassandra-2.1 Commit: 6ce04564227d0ca4bd895797afdc8cba032165bd Parents: a15e11a cb4bc27 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 26 19:17:11 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 26 19:17:11 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 5 +++ .../org/apache/cassandra/cql3/CQLTester.java | 7 +++++ .../apache/cassandra/cql3/CreateTableTest.java | 32 ++++++++++++++++++++ 4 files changed, 45 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ce04564/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ce04564/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ce04564/test/unit/org/apache/cassandra/cql3/CQLTester.java ----------------------------------------------------------------------
