cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Tue, 12 Jan 2016 17:53:42 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3

Conflicts:
	CHANGES.txt


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

Branch: refs/heads/cassandra-3.3
Commit: f4ba752b32db2950f2a816b2e7896941de14b822
Parents: 91d7bed 2569fbd
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Jan 12 11:53:23 2016 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Jan 12 11:53:23 2016 -0600

----------------------------------------------------------------------
 CHANGES.txt  | 2 ++
 bin/cqlsh.py | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ba752b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a301b0f,3ec5346..a9202ce
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,4 +1,7 @@@
 -3.0.3
 +3.3
 +Merged from 3.0:
++ * (cqlsh) Also apply --connect-timeout to control connection
++   timeout (CASSANDRA-10959)
   * Fix AssertionError when removing from list using UPDATE (CASSANDRA-10954)
   * Fix UnsupportedOperationException when reading old sstable with range
     tombstone (CASSANDRA-10743)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f4ba752b/bin/cqlsh.py
----------------------------------------------------------------------


Mime
View raw message