You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2014/08/12 01:29:39 UTC

[1/2] git commit: Prompt on missing dependency in cqlsh on Windows Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749

Repository: cassandra
Updated Branches:
  refs/heads/trunk 70d9f895d -> 0eb9e8cfb


Prompt on missing dependency in cqlsh on Windows
Patch by Josh McKenzie, reviewed by Jonathan Ellis for CASSANDRA-7749


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/384f873c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/384f873c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/384f873c

Branch: refs/heads/trunk
Commit: 384f873ce093f4c870b1657649c2a5b854a18de1
Parents: 334969f
Author: Joshua McKenzie <Jo...@datastax.com>
Authored: Mon Aug 11 15:30:19 2014 -0500
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 12 02:28:51 2014 +0300

----------------------------------------------------------------------
 bin/cqlsh | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/384f873c/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index a4ad6d0..5b63696 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -728,6 +728,8 @@ class Shell(cmd.Cmd):
             try:
                 import readline
             except ImportError:
+                if platform.system() == 'Windows':
+                    print "WARNING: pyreadline dependency missing.  Install to enable tab completion."
                 pass
             else:
                 old_completer = readline.get_completer()


[2/2] git commit: Merge branch 'cassandra-2.1' into trunk

Posted by al...@apache.org.
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/0eb9e8cf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0eb9e8cf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0eb9e8cf

Branch: refs/heads/trunk
Commit: 0eb9e8cfbca00ca0ebff08e7b59d7056b9737c5e
Parents: 70d9f89 384f873
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Aug 12 02:29:11 2014 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Aug 12 02:29:11 2014 +0300

----------------------------------------------------------------------

----------------------------------------------------------------------