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/8ce346d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8ce346d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8ce346d7 Branch: refs/heads/trunk Commit: 8ce346d7beab67c2a68ae8c93b74e00174c30424 Parents: 9aea917 5549680 Author: Sylvain Lebresne <[email protected]> Authored: Mon Aug 18 12:24:23 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Aug 18 12:24:23 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/CFMetaData.java | 42 ++++++++++++++------ .../cql3/statements/CreateTableStatement.java | 9 ++++- 3 files changed, 39 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ce346d7/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ce346d7/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8ce346d7/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java ----------------------------------------------------------------------
