Merge branch 'cassandra-3.9' into trunk * cassandra-3.9: Super columns are broken after upgrading to 3.0 on thrift
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cc0d152 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cc0d152 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cc0d152 Branch: refs/heads/trunk Commit: 5cc0d152bde6eb027bf7c1e86f0bc4256e688daa Parents: a69d13b 1323ad0 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Aug 3 17:29:44 2016 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Aug 3 17:29:44 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc0d152/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cc0d152/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java ----------------------------------------------------------------------