Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14826794 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14826794 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14826794 Branch: refs/heads/trunk Commit: 14826794c38a395d5df6ee63a3bd1cfee09b4039 Parents: c7f3a23 d2ae187 Author: Tyler Hobbs <[email protected]> Authored: Wed Jul 16 11:57:48 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Jul 16 11:57:48 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 44 +++-- lib/cassandra-driver-internal-only-1.1.2.zip | Bin 105983 -> 0 bytes ...sandra-driver-internal-only-2.1.0b1.post.zip | Bin 0 -> 125786 bytes lib/licenses/cassandra-driver-1.0.2.txt | 177 ------------------- lib/licenses/cassandra-driver-2.1.0b1.post.txt | 177 +++++++++++++++++++ lib/licenses/six-1.7.3.txt | 18 ++ lib/six-1.7.3-py2.py3-none-any.zip | Bin 0 -> 9503 bytes pylib/cqlshlib/formatting.py | 8 +- pylib/cqlshlib/test/test_cqlsh_completion.py | 2 +- pylib/cqlshlib/test/test_cqlsh_output.py | 2 +- pylib/cqlshlib/usertypes.py | 117 ------------ 12 files changed, 236 insertions(+), 310 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/14826794/CHANGES.txt ----------------------------------------------------------------------
