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/5b615453 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5b615453 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5b615453 Branch: refs/heads/trunk Commit: 5b61545315443fea9064a789defb0d374921d75b Parents: bf21df2 2252773 Author: Tyler Hobbs <[email protected]> Authored: Tue May 5 14:46:06 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Tue May 5 14:46:06 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 42 ++++++++++++++++++++-- lib/cassandra-driver-internal-only-2.5.0.zip | Bin 189224 -> 0 bytes lib/cassandra-driver-internal-only-2.5.1.zip | Bin 0 -> 192609 bytes 4 files changed, 41 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b615453/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5b615453/bin/cqlsh ----------------------------------------------------------------------
