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/3fabc335 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3fabc335 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3fabc335 Branch: refs/heads/trunk Commit: 3fabc33506f5d182022917ebbc30335d75b54b72 Parents: 54877fe 0475922 Author: Tyler Hobbs <[email protected]> Authored: Tue Nov 29 15:35:01 2016 -0600 Committer: Tyler Hobbs <[email protected]> Committed: Tue Nov 29 15:35:01 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh.py | 28 ++++++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3fabc335/CHANGES.txt ----------------------------------------------------------------------
