cassandra-commits mailing list archives

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


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

Branch: refs/heads/trunk
Commit: a883ff5f31ce47d03306a0a322109c04d01ed534
Parents: 22a1bbb f4ba752
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Tue Jan 12 11:53:49 2016 -0600
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Tue Jan 12 11:53:49 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/a883ff5f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e03b6a1,a9202ce..36f0a8a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,7 +1,13 @@@
 +3.4
 + * Stripe view locks by key and table ID to reduce contention (CASSANDRA-10981)
 + * Add nodetool gettimeout and settimeout commands (CASSANDRA-10953)
 + * Add 3.0 metadata to sstablemetadata output (CASSANDRA-10838)
 +
 +
  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)


Mime
View raw message