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

Merge branch 'cassandra-2.2' into cassandra-3.0

This commit is contained in:
Stefan Podkowinski 2017-03-23 20:49:05 +01:00
parent f53e502c3c 5978f9d5f7
commit 631162271c
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -6,6 +6,7 @@
* Slice.isEmpty() returns false for some empty slices (CASSANDRA-13305)
* Add formatted row output to assertEmpty in CQL Tester (CASSANDRA-13238)
Merged from 2.2:
* Honor truststore-password parameter in cassandra-stress (CASSANDRA-12773)
* Discard in-flight shadow round responses (CASSANDRA-12653)
* Don't anti-compact repaired data to avoid inconsistencies (CASSANDRA-13153)
* Wrong logger name in AnticompactionTask (CASSANDRA-13343)

1
tools/stress/src/org/apache/cassandra/stress/settings/SettingsTransport.java
View File

@ -115,6 +115,7 @@ public class SettingsTransport implements Serializable
{
// mandatory for SSLFactory.createSSLContext(), see CASSANDRA-9325
encOptions.keystore = encOptions.truststore;
encOptions.keystore_password = encOptions.truststore_password;
}
encOptions.algorithm = options.alg.value();
encOptions.protocol = options.protocol.value();