Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9515fca7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9515fca7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9515fca7 Branch: refs/heads/trunk Commit: 9515fca7692ed09aa0b3c6c12f038d6a459d87de Parents: 7a7fb8e d76d3a5 Author: Sylvain Lebresne <[email protected]> Authored: Thu Oct 8 12:07:04 2015 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Oct 8 12:07:04 2015 +0200 ---------------------------------------------------------------------- .../org/apache/cassandra/config/CFMetaData.java | 2 +- .../cql3/statements/AlterTableStatement.java | 99 +++++++++++--------- .../org/apache/cassandra/cql3/ViewTest.java | 76 +++++++++++++++ .../cql3/validation/operations/AlterTest.java | 14 +++ 4 files changed, 148 insertions(+), 43 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9515fca7/src/java/org/apache/cassandra/config/CFMetaData.java ----------------------------------------------------------------------
