Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f75e706 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f75e706 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f75e706 Branch: refs/heads/trunk Commit: 9f75e706871aaeac749e45d2dd226b99950ce436 Parents: cd728d2 541d837 Author: Carl Yeksigian <c...@apache.org> Authored: Wed Oct 12 12:34:16 2016 -0400 Committer: Carl Yeksigian <c...@apache.org> Committed: Wed Oct 12 12:34:16 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/view/TableViews.java | 91 +++++++++++++++++--- .../apache/cassandra/db/view/ViewBuilder.java | 11 ++- .../cassandra/db/view/ViewUpdateGenerator.java | 8 ++ 4 files changed, 93 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f75e706/CHANGES.txt ----------------------------------------------------------------------