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.8' into cassandra-3.9 

Conflicts:
	CHANGES.txt
This commit is contained in:
Dave Brosius 2016-07-26 20:20:52 -04:00
parent 5fe02b3131 b27e2f93cc
commit aa64e65e1e
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -15,7 +15,6 @@ Merged from 2.2:
Merged from 2.1:
* cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
3.8
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)

2
src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
View File

@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.zip.CRC32;
import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;