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/c6eaffc2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6eaffc2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6eaffc2 Branch: refs/heads/trunk Commit: c6eaffc2a162ada943f82608c8d73115f7f3d93a Parents: f9e2990 a3effe6 Author: Mikhail Stepura <[email protected]> Authored: Wed May 21 13:28:48 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Wed May 21 13:28:48 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 +- bin/cqlsh | 9 +++--- ...assandra-driver-internal-only-1.0.2.post.zip | Bin 95846 -> 0 bytes lib/cassandra-driver-internal-only-1.1.2.zip | Bin 0 -> 105983 bytes pylib/cqlshlib/cql3handling.py | 2 +- pylib/cqlshlib/test/test_cqlsh_output.py | 30 +++++++++++++++++++ pylib/cqlshlib/test/test_keyspace_init.cql | 26 ++++++++++++++++ pylib/cqlshlib/usertypes.py | 9 +++--- 8 files changed, 68 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6eaffc2/CHANGES.txt ----------------------------------------------------------------------
