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/6076f8ff Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6076f8ff Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6076f8ff Branch: refs/heads/trunk Commit: 6076f8ff32e8ccd1dd086cc3d190865173001530 Parents: f9e0210 f9fc846 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Jul 23 13:14:37 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Jul 23 13:14:37 2014 -0500 ---------------------------------------------------------------------- bin/cqlsh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ----------------------------------------------------------------------
