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/e471dab3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e471dab3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e471dab3 Branch: refs/heads/trunk Commit: e471dab3144a23c88656be77608387a467d01abf Parents: b9e42df 6ce0456 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 26 19:18:19 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 26 19:18:19 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/e471dab3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e471dab3/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
