natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Mick Semb Wever 2018-05-09 21:39:49 +10:00
parent d91cccddea 72fb86d5a5
commit e5d997374a
No known key found for this signature in database
GPG Key ID: E91335D77E3E87CB
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -237,6 +237,7 @@
3.11.3
* Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
* Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
* Fix cqlsh to read connection.ssl cqlshrc option again (CASSANDRA-14299)
* Downgrade log level to trace for CommitLogSegmentManager (CASSANDRA-14370)

3
src/java/org/apache/cassandra/service/StorageService.java
View File

@ -4926,7 +4926,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
public List<String> getNonSystemKeyspaces()
{
return Schema.instance.getNonSystemKeyspaces();
List<String> nonKeyspaceNamesList = new ArrayList<>(Schema.instance.getNonSystemKeyspaces());
return Collections.unmodifiableList(nonKeyspaceNamesList);
}
public List<String> getNonLocalStrategyKeyspaces()