This is an automated email from the ASF dual-hosted git repository.
samt pushed a change to branch cassandra-3.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from c092c46 Merge branch 'cassandra-2.2' into cassandra-3.0
new c8c3c26 Fix nomenclature of deny and allow lists
new 0a1e8d1 Merge branch 'cassandra-2.2' into cassandra-3.0
The 2 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 +
.../cassandra/cql3/functions/UDFunction.java | 22 ++++++++--------
src/java/org/apache/cassandra/db/Directories.java | 28 ++++++++++-----------
...Directories.java => DisallowedDirectories.java} | 29 +++++++++++-----------
...sMBean.java => DisallowedDirectoriesMBean.java} | 3 ++-
.../db/compaction/AbstractCompactionStrategy.java | 6 ++---
.../cassandra/db/compaction/LeveledManifest.java | 2 +-
.../cassandra/hints/HintsDispatchExecutor.java | 2 +-
.../org/apache/cassandra/hints/HintsStore.java | 10 ++++----
.../cassandra/io/sstable/format/SSTableReader.java | 2 +-
.../cassandra/service/DefaultFSErrorHandler.java | 6 ++---
test/unit/org/apache/cassandra/Util.java | 4 +--
.../org/apache/cassandra/db/DirectoriesTest.java | 2 +-
....java => CorruptedSSTablesCompactionsTest.java} | 17 +++++++------
14 files changed, 69 insertions(+), 65 deletions(-)
rename src/java/org/apache/cassandra/db/{BlacklistedDirectories.java =>
DisallowedDirectories.java} (77%)
rename src/java/org/apache/cassandra/db/{BlacklistedDirectoriesMBean.java =>
DisallowedDirectoriesMBean.java} (95%)
rename
test/unit/org/apache/cassandra/db/compaction/{BlacklistingCompactionsTest.java
=> CorruptedSSTablesCompactionsTest.java} (93%)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
