This is an automated email from the ASF dual-hosted git repository.

marcuse pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 968b506  Merge branch 'cassandra-4.0' into trunk
     new 1d87da3  Adding columns via ALTER TABLE can generate corrupt sstables
     new 6301bea  Merge branch 'cassandra-3.0' into cassandra-3.11
     new 9494240  Merge branch 'cassandra-3.11' into cassandra-4.0.0
     new bc51158  Merge branch 'cassandra-4.0.0' into cassandra-4.0
     new eff1c38  Merge branch 'cassandra-4.0' into trunk

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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]

Reply via email to