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

blerer pushed a change to branch cassandra-4.0.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.


    from 33414cc  Merge branch 'cassandra-3.11' into cassandra-4.0.0
     add 6ef3eaf  update IDEA setup generation to mark test/conf as test 
resources
     add ba2538d  Merge branch 'cassandra-3.0' into cassandra-3.11
     add d54eff3  Remove full project building from the generate-idea-files ant 
target
     add b857aa1  Merge branch 'cassandra-3.0' into cassandra-3.11
     add 9b6dd38  Add flag to disable ALTER...DROP COMPACT STORAGE statements
     add 91c12bd  Merge branch cassandra-3.0 into cassandra-3.11
     add bdb7c3b  Merge branch cassandra-3.11 into cassandra-4.0.0

No new revisions were added by this update.

Summary of changes:
 CHANGES.txt                                                   |  1 +
 NEWS.txt                                                      | 11 +++++++++--
 conf/cassandra.yaml                                           |  4 ++++
 doc/source/configuration/cass_yaml_file.rst                   |  8 ++++++++
 src/java/org/apache/cassandra/config/Config.java              |  2 ++
 src/java/org/apache/cassandra/config/DatabaseDescriptor.java  | 11 +++++++++++
 .../cassandra/cql3/statements/schema/AlterTableStatement.java |  5 ++++-
 test/conf/cassandra.yaml                                      |  1 +
 .../org/apache/cassandra/distributed/test/CountersTest.java   |  2 +-
 .../distributed/upgrade/CompactStorageUpgradeTest.java        |  2 +-
 .../apache/cassandra/distributed/upgrade/UpgradeTestBase.java | 10 ++++++++++
 .../cassandra/cql3/validation/operations/AlterTest.java       | 11 +++++++++++
 12 files changed, 63 insertions(+), 5 deletions(-)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to