[11/13] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

[jmckenzie]

Merge branch 'cassandra-3.0' into cassandra-3.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/744daf04
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/744daf04
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/744daf04

Branch: refs/heads/cassandra-3.1
Commit: 744daf042ec4afdba9949abe95fb473c3d5acc6b
Parents: f0d45ea 05300b2
Author: Joshua McKenzie 
Authored: Fri Dec 4 13:10:42 2015 -0500
Committer: Joshua McKenzie 
Committed: Fri Dec 4 13:10:42 2015 -0500

--
 .../cassandra/metrics/ThreadPoolMetrics.java| 31 +++-
 .../org/apache/cassandra/tools/NodeProbe.java   | 15 --
 .../cassandra/tools/nodetool/TpStats.java   | 23 ---
 .../apache/cassandra/utils/StatusLogger.java| 15 +-
 4 files changed, 63 insertions(+), 21 deletions(-)
--

[11/13] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

[jmckenzie]

Merge branch 'cassandra-3.0' into cassandra-3.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6bda8868
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6bda8868
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6bda8868

Branch: refs/heads/cassandra-3.1
Commit: 6bda8868caedc831767e7de398e9d3be53142a11
Parents: 60aeef3 803a3d9
Author: Joshua McKenzie 
Authored: Tue Dec 1 13:56:25 2015 -0500
Committer: Joshua McKenzie 
Committed: Tue Dec 1 13:56:25 2015 -0500

--
 ...andra-driver-internal-only-3.0.0-6af642d.zip | Bin 0 -> 228893 bytes
 ...iver-internal-only-3.0.0a3.post0-3f15725.zip | Bin 234113 -> 0 bytes
 pylib/cqlshlib/cql3handling.py  |  36 +--
 pylib/cqlshlib/test/test_cqlsh_completion.py|  10 +++---
 pylib/cqlshlib/test/test_cqlsh_output.py|  15 
 5 files changed, 23 insertions(+), 38 deletions(-)
--