This is an automated email from the ASF dual-hosted git repository. jlewandowski pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 7d3a8d5312 Merge branch 'cassandra-5.0' into trunk add ac71d0f56e Fixed the inconsistency between distributedKeyspaces and distributedAndLocalKeyspaces add 57f494d8d4 Merge branch 'cassandra-4.1' into cassandra-5.0 new c2c20ab843 Merge branch 'cassandra-5.0' into trunk The 1 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 | 2 + .../cql3/statements/DescribeStatement.java | 3 +- .../statements/schema/CreateTableStatement.java | 1 - src/java/org/apache/cassandra/db/Keyspace.java | 7 +-- .../cassandra/db/compaction/CompactionManager.java | 2 +- .../org/apache/cassandra/dht/BootStrapper.java | 2 +- .../index/sai/virtual/ColumnIndexesSystemView.java | 9 ++- .../sai/virtual/SSTableIndexesSystemView.java | 11 ++-- .../index/sai/virtual/SegmentsSystemView.java | 9 ++- .../org/apache/cassandra/metrics/TableMetrics.java | 2 +- .../repair/consistent/admin/SchemaArgsParser.java | 2 +- src/java/org/apache/cassandra/schema/Schema.java | 65 +++++++--------------- .../org/apache/cassandra/schema/SchemaEvent.java | 4 +- .../service/PendingRangeCalculatorService.java | 2 +- .../apache/cassandra/service/StorageService.java | 42 +++++++------- .../org/apache/cassandra/dht/BootStrapperTest.java | 2 +- .../cassandra/locator/SimpleStrategyTest.java | 4 +- .../cassandra/schema/SchemaKeyspaceTest.java | 2 +- .../org/apache/cassandra/schema/SchemaTest.java | 2 +- .../cassandra/service/LeaveAndBootstrapTest.java | 4 +- .../org/apache/cassandra/service/MoveTest.java | 4 +- 21 files changed, 77 insertions(+), 104 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org