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/310d6e4e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/310d6e4e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/310d6e4e Branch: refs/heads/trunk Commit: 310d6e4efba63a809fac6237660545aad4009a40 Parents: 28497fd a0d096b Author: Mikhail Stepura <[email protected]> Authored: Thu May 8 13:33:00 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Thu May 8 13:33:00 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 2 +- bin/cqlsh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/310d6e4e/CHANGES.txt ----------------------------------------------------------------------
