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 trunk

This commit is contained in:
T Jake Luciani 2015-06-25 14:35:10 -04:00
parent e7852a3e56 26bd5124ef
commit 9a71238706
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.xml
View File

@ -38,7 +38,6 @@
<property name="build.src.resources" value="${basedir}/src/resources"/>
<property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
<property name="build.lib" value="${basedir}/lib"/>
<property name="build.tools.lib" value="${basedir}/tools/lib"/>
<property name="build.dir" value="${basedir}/build"/>
<property name="build.dir.lib" value="${basedir}/build/lib"/>
<property name="build.test.dir" value="${build.dir}/test"/>
@ -785,9 +784,6 @@
<fileset dir="${build.lib}">
<include name="**/*.jar" />
</fileset>
<fileset dir="${build.tools.lib}">
<include name="**/*.jar" />
</fileset>
</path>
</classpath>
</javac>
@ -1012,9 +1008,6 @@
<fileset dir="${build.dir}/tools/lib/">
<include name="*.jar" />
</fileset>
<fileset dir="${build.tools.lib}">
<include name="*.jar" />
</fileset>
</copy>
<artifact:writepom pomRefId="dist-pom"
file="${build.dir}/${final.name}-dist.pom"/>

BIN
tools/lib/netty-3.9.0.Final.jar
View File

Binary file not shown.

4
tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java
View File

@ -89,9 +89,13 @@ public class JavaDriverClient
public void connect(ProtocolOptions.Compression compression) throws Exception
{
PoolingOptions poolingOpts = new PoolingOptions();
poolingOpts.setCoreConnectionsPerHost(HostDistance.LOCAL, 8);
Cluster.Builder clusterBuilder = Cluster.builder()
.addContactPoint(host)
.withPort(port)
.withPoolingOptions(poolingOpts)
.withProtocolVersion(ProtocolVersion.V2)
.withoutMetrics(); // The driver uses metrics 3 with conflict with our version
if (whitelist != null)
clusterBuilder.withLoadBalancingPolicy(whitelist);