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/be6cf8a3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be6cf8a3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be6cf8a3 Branch: refs/heads/trunk Commit: be6cf8a32594168dcff14d9a68ba6e060691066d Parents: 4e4761c 6b34d46 Author: Mikhail Stepura <[email protected]> Authored: Sat Aug 2 17:09:11 2014 -0700 Committer: Mikhail Stepura <[email protected]> Committed: Sat Aug 2 17:09:11 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/be6cf8a3/CHANGES.txt ----------------------------------------------------------------------
