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.0' into cassandra-3.11

This commit is contained in:
Jason Brown 2017-03-16 13:26:53 -07:00
parent 6e76bbb3fa 0c07840f2a
commit 8fcf83738d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -35,6 +35,7 @@ Merged from 3.0:
* Provide user workaround when system_schema.columns does not contain entries
for a table that's in system_schema.tables (CASSANDRA-13180)
Merged from 2.2:
* Wrong logger name in AnticompactionTask (CASSANDRA-13343)
* Commitlog replay may fail if last mutation is within 4 bytes of end of segment (CASSANDRA-13282)
* Fix queries updating multiple time the same list (CASSANDRA-13130)
* Fix GRANT/REVOKE when keyspace isn't specified (CASSANDRA-13053)

2
src/java/org/apache/cassandra/repair/AnticompactionTask.java
View File

@ -54,7 +54,7 @@ public class AnticompactionTask extends AbstractFuture<InetAddress> implements R
* If Cassandra version is more than this, we need to wait for anticompaction response.
*/
private static final CassandraVersion VERSION_CHECKER = new CassandraVersion("2.1.5");
private static Logger logger = LoggerFactory.getLogger(RepairSession.class);
private static Logger logger = LoggerFactory.getLogger(AnticompactionTask.class);
private final UUID parentSession;
private final InetAddress neighbor;