cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [14/15] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.3
Date Tue, 02 Feb 2016 14:01:52 GMT
Merge branch 'cassandra-3.0' into cassandra-3.3


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

Branch: refs/heads/trunk
Commit: e96fae3ca2902219cea7ec6cd6b0a92fdac7b7c9
Parents: fddace6 b087b4c
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Feb 2 14:59:58 2016 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Feb 2 14:59:58 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 pylib/cqlshlib/copyutil.py                      | 87 +++++++++++++-------
 .../cassandra/transport/ServerConnection.java   |  4 +-
 3 files changed, 58 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96fae3c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c0acd3d,47d2dc1..53208c0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -43,7 -49,17 +43,8 @@@ Merged from 2.2
   * Optimize pending range computation (CASSANDRA-9258)
   * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
   * drop/alter user should be case sensitive (CASSANDRA-10817)
 - * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
 - * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
 - * Add new types to Stress (CASSANDRA-9556)
 - * Add property to allow listening on broadcast interface (CASSANDRA-9748)
 - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
 - * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
 - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
 - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
 - * (cqlsh) encode input correctly when saving history
  Merged from 2.1:
+  * test_bulk_round_trip_blogposts is failing occasionally (CASSANDRA-10938)
   * Fix isJoined return true only after becoming cluster member (CASANDRA-11007)
   * Fix bad gossip generation seen in long-running clusters (CASSANDRA-10969)
   * Avoid NPE when incremental repair fails (CASSANDRA-10909)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96fae3c/pylib/cqlshlib/copyutil.py
----------------------------------------------------------------------


Mime
View raw message