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/96addeed Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96addeed Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96addeed Branch: refs/heads/trunk Commit: 96addeedf6e355d35f5e554344ee781d351efa42 Parents: 7192f17 3a03d4b Author: Tyler Hobbs <ty...@datastax.com> Authored: Tue Aug 19 14:55:30 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Tue Aug 19 14:55:30 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ bin/cqlsh | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/96addeed/CHANGES.txt ----------------------------------------------------------------------
