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/7230a663 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7230a663 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7230a663 Branch: refs/heads/trunk Commit: 7230a66318ce8add742959d095900d5870689f0c Parents: 02d8ebd 1a31958 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Wed Jan 27 14:37:03 2016 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Wed Jan 27 14:37:03 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7230a663/CHANGES.txt ----------------------------------------------------------------------
