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/501c3e56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/501c3e56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/501c3e56 Branch: refs/heads/trunk Commit: 501c3e564b4d73cec45cb16c38ea1656e3bc363d Parents: c69f257 a37a036 Author: Mikhail Stepura <mish...@apache.org> Authored: Tue Aug 19 14:57:48 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Tue Aug 19 14:57:48 2014 -0700 ---------------------------------------------------------------------- pylib/cqlshlib/test/test_cqlsh_completion.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
