Merge branch 'cassandra-3.X' into trunk * cassandra-3.X: cdc column addition still breaks schema migration tasks
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c18968b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c18968b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c18968b1 Branch: refs/heads/trunk Commit: c18968b1bd54b182f8d65126ccc03586001b62ed Parents: 78ff377 57e9a83 Author: Sylvain Lebresne <[email protected]> Authored: Thu Sep 29 17:00:57 2016 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Sep 29 17:00:57 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/rows/WithOnlyQueriedData.java | 7 +++++ .../cassandra/db/transform/Transformation.java | 12 +++++++++ .../cassandra/db/transform/UnfilteredRows.java | 11 ++++++++ .../apache/cassandra/schema/SchemaKeyspace.java | 28 +++++++++++++++++++- 5 files changed, 58 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c18968b1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 03456a0,c33b1d3..8a1fd1d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ +4.0 + + 3.10 + * cdc column addition still breaks schema migration tasks (CASSANDRA-12697) * Upgrade metrics-reporter dependencies (CASSANDRA-12089) * Tune compaction thread count via nodetool (CASSANDRA-12248) * Add +=/-= shortcut syntax for update queries (CASSANDRA-12232)
