Merge branch cassandra-2.2 into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/363e7bd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/363e7bd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/363e7bd7 Branch: refs/heads/trunk Commit: 363e7bd716b1c0b798f740b88bcb336c41f33470 Parents: 98178f5 b03ce9f Author: Benjamin Lerer <b.le...@gmail.com> Authored: Wed Dec 16 15:19:20 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Wed Dec 16 15:19:20 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/StressProfile.java | 8 ++++ .../stress/generate/values/LocalDates.java | 43 +++++++++++++++++++ .../stress/generate/values/SmallInts.java | 38 +++++++++++++++++ .../cassandra/stress/generate/values/Times.java | 37 ++++++++++++++++ .../stress/generate/values/TinyInts.java | 45 ++++++++++++++++++++ .../operations/userdefined/SchemaStatement.java | 16 +++++-- .../cassandra/stress/util/JavaDriverClient.java | 1 + 8 files changed, 185 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/363e7bd7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index dd1896c,1480960..10504c7 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -2.2.5 +3.0.3 +Merged from 2.2: + * Add new types to Stress (CASSANDRA-9556) * Add property to allow listening on broadcast interface (CASSANDRA-9748) * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) * Better handling of SSL connection errors inter-node (CASSANDRA-10816) http://git-wip-us.apache.org/repos/asf/cassandra/blob/363e7bd7/tools/stress/src/org/apache/cassandra/stress/StressProfile.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/363e7bd7/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java ---------------------------------------------------------------------- diff --cc tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java index d0779ed,30d0d4a..7d5f38c --- a/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/JavaDriverClient.java @@@ -114,7 -95,7 +114,8 @@@ public class JavaDriverClien .addContactPoint(host) .withPort(port) .withPoolingOptions(poolingOpts) + .withoutJMXReporting() + .withProtocolVersion(ProtocolVersion.NEWEST_SUPPORTED) .withoutMetrics(); // The driver uses metrics 3 with conflict with our version if (whitelist != null) clusterBuilder.withLoadBalancingPolicy(whitelist);
