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/cdf08084 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdf08084 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdf08084 Branch: refs/heads/trunk Commit: cdf08084d46d4b9efb14a1e30bee6010caf16fea Parents: 944c171 c33e77a Author: Benedict Elliott Smith <[email protected]> Authored: Mon Jun 23 16:57:01 2014 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Mon Jun 23 16:57:01 2014 +0100 ---------------------------------------------------------------------- bin/cqlsh | 4 ++++ 1 file changed, 4 insertions(+) ----------------------------------------------------------------------
