Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/190e14a0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/190e14a0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/190e14a0 Branch: refs/heads/trunk Commit: 190e14a076a13cbd759aa4e8ec2b0a635e8cc2c1 Parents: f82646e 83ad9ce Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 22 16:08:36 2016 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 22 16:08:36 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 3 ++- bin/cqlsh.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/190e14a0/CHANGES.txt ----------------------------------------------------------------------