Merge branch 'cassandra-2.1.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e64c301d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e64c301d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e64c301d Branch: refs/heads/cassandra-2.1 Commit: e64c301dd37d36d543545b7ee44c00d71a3bfd18 Parents: 22f811e e4b40c7 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Jul 17 14:45:07 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Jul 17 14:45:07 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e64c301d/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e64c301d/bin/cqlsh ----------------------------------------------------------------------