This is an automated email from the ASF dual-hosted git repository. marcuse pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit eff1c38263afa750e82b283c268a3fcad2304680 Merge: 968b506 bc51158 Author: Marcus Eriksson <[email protected]> AuthorDate: Mon Jun 21 15:52:27 2021 +0200 Merge branch 'cassandra-4.0' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Columns.java | 18 +--- .../apache/cassandra/db/SerializationHeader.java | 4 +- .../apache/cassandra/db/filter/ColumnFilter.java | 4 +- .../cassandra/db/partitions/PartitionUpdate.java | 8 -- .../cassandra/db/rows/SerializationHelper.java | 12 --- .../cassandra/db/rows/UnfilteredSerializer.java | 21 +--- .../apache/cassandra/schema/ColumnMetadata.java | 25 +---- .../distributed/test/SchemaDisagreementTest.java | 93 ----------------- .../cassandra/distributed/test/SchemaTest.java | 112 ++++++++------------- test/unit/org/apache/cassandra/db/ColumnsTest.java | 2 +- 11 files changed, 55 insertions(+), 245 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
