This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch cassandra-3.0 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 63097a37c0e9791ed547f615ff891d643d91e841 Merge: 97eae44 b2f6953 Author: Sam Tunnicliffe <s...@beobal.com> AuthorDate: Fri Jul 5 18:57:46 2019 +0100 Merge branch 'cassandra-2.2' into cassandra-3.0 CHANGES.txt | 1 + .../apache/cassandra/auth/CassandraAuthorizer.java | 23 +++++------ .../cassandra/auth/CassandraRoleManager.java | 45 +++++++++++++--------- .../cassandra/auth/PasswordAuthenticator.java | 2 +- .../apache/cassandra/auth/PermissionsCache.java | 17 ++++++-- src/java/org/apache/cassandra/auth/Roles.java | 25 +++++++++--- src/java/org/apache/cassandra/auth/RolesCache.java | 19 +++++---- .../exceptions/AuthenticationException.java | 5 +++ .../exceptions/UnauthorizedException.java | 5 +++ .../org/apache/cassandra/service/ClientState.java | 13 ++++++- 10 files changed, 106 insertions(+), 49 deletions(-) diff --cc CHANGES.txt index c891ce2,d8da354..364720d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,6 +1,23 @@@ -2.2.15 +3.0.19 + * Multiget thrift query returns null records after digest mismatch (CASSANDRA-14812) + * Skipping illegal legacy cells can break reverse iteration of indexed partitions (CASSANDRA-15178) + * Handle paging states serialized with a different version than the session's (CASSANDRA-15176) + * Throw IOE instead of asserting on unsupporter peer versions (CASSANDRA-15066) + * Update token metadata when handling MOVING/REMOVING_TOKEN events (CASSANDRA-15120) + * Add ability to customize cassandra log directory using $CASSANDRA_LOG_DIR (CASSANDRA-15090) + * Skip cells with illegal column names when reading legacy sstables (CASSANDRA-15086) + * Fix assorted gossip races and add related runtime checks (CASSANDRA-15059) + * Fix mixed mode partition range scans with limit (CASSANDRA-15072) + * cassandra-stress works with frozen collections: list and set (CASSANDRA-14907) + * For nodetool listsnapshots output, put spaces between columns, and increase snapshot padding (CASSANDRA-14876) + * Fix handling FS errors on writing and reading flat files - LogTransaction and hints (CASSANDRA-15053) + * Avoid double closing the iterator to avoid overcounting the number of requests (CASSANDRA-15058) + * Improve `nodetool status -r` speed (CASSANDRA-14847) + * Improve merkle tree size and time on heap (CASSANDRA-14096) + * Add missing commands to nodetool-completion (CASSANDRA-14916) + * Anti-compaction temporarily corrupts sstable state for readers (CASSANDRA-15004) + Merged from 2.2: + * Handle exceptions during authentication/authorization (CASSANDRA-15041) - * Fix JDK7 compatibility broken in cassandra-2.2 (CASSANDRA-15050) * Support cross version messaging in in-jvm upgrade dtests (CASSANDRA-15078) * Fix index summary redistribution cancellation (CASSANDRA-15045) * Refactor Circle CI configuration (CASSANDRA-14806) diff --cc src/java/org/apache/cassandra/service/ClientState.java index 641d174,9593802..bba6ca4 --- a/src/java/org/apache/cassandra/service/ClientState.java +++ b/src/java/org/apache/cassandra/service/ClientState.java @@@ -37,9 -38,11 +37,10 @@@ import org.apache.cassandra.cql3.functi import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.exceptions.AuthenticationException; import org.apache.cassandra.exceptions.InvalidRequestException; + import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.UnauthorizedException; -import org.apache.cassandra.schema.LegacySchemaTables; +import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.thrift.ThriftValidation; -import org.apache.cassandra.tracing.TraceKeyspace; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.CassandraVersion; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org