Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5af71cf6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5af71cf6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5af71cf6 Branch: refs/heads/trunk Commit: 5af71cf691134836965a6ac81633b7651b73e3c3 Parents: df84bdf 25653ba Author: Stefania Alborghetti <stefania.alborghe...@datastax.com> Authored: Thu Nov 24 08:58:40 2016 +0800 Committer: Stefania Alborghetti <stefania.alborghe...@datastax.com> Committed: Thu Nov 24 08:58:40 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/stress/util/JavaDriverClient.java | 33 +++++++++++--------- 2 files changed, 20 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5af71cf6/CHANGES.txt ----------------------------------------------------------------------