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/1a1c5a00 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a1c5a00 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a1c5a00 Branch: refs/heads/trunk Commit: 1a1c5a0080173abd1ed7dd22e179c41b421e9506 Parents: 10e9c19 1a9286c Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Aug 11 02:17:36 2015 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Aug 11 02:17:36 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../AlterMaterializedViewStatement.java | 5 ++- .../CreateMaterializedViewStatement.java | 2 +- .../DropMaterializedViewStatement.java | 35 ++++++-------------- .../cql3/statements/SelectStatement.java | 14 ++++++-- .../cassandra/db/view/MaterializedView.java | 17 ++++++++++ 6 files changed, 46 insertions(+), 28 deletions(-) ----------------------------------------------------------------------
