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/7c68abcd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c68abcd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c68abcd

Branch: refs/heads/trunk
Commit: 7c68abcd8c868860097c73e3816b6ac9fcba6eac
Parents: 02a12fa 74070ee
Author: Tyler Hobbs <[email protected]>
Authored: Wed Nov 18 18:31:59 2015 -0600
Committer: Tyler Hobbs <[email protected]>
Committed: Wed Nov 18 18:31:59 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                  |   1 +
 bin/cqlsh.py                 | 153 +++------
 pylib/cqlshlib/copy.py       | 647 ++++++++++++++++++++++++++++++++++++++
 pylib/cqlshlib/displaying.py |  10 +
 pylib/cqlshlib/formatting.py |  32 +-
 5 files changed, 725 insertions(+), 118 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7c68abcd/CHANGES.txt
----------------------------------------------------------------------

Reply via email to