Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f5c4f7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f5c4f7b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f5c4f7b Branch: refs/heads/trunk Commit: 1f5c4f7ba55cbb8fada610d1882a616b4000e741 Parents: 1526568 9ad1330 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Thu Jul 23 13:24:53 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Thu Jul 23 13:24:53 2015 -0400 ---------------------------------------------------------------------- bin/cqlsh.py | 2 +- bin/nodetool.bat | 5 ++++- pylib/cqlshlib/formatting.py | 17 +++++++++++++++-- 3 files changed, 20 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
