cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Date Mon, 28 Nov 2016 13:38:26 GMT
Merge branch 'cassandra-3.X' into trunk


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

Branch: refs/heads/trunk
Commit: b93e96a9e27eae974d674418013b679e9242d6b2
Parents: 8fb01dd f60ab23
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Mon Nov 28 05:35:03 2016 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Mon Nov 28 05:36:06 2016 -0800

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/net/IncomingTcpConnection.java    |  5 +++--
 .../org/apache/cassandra/net/MessageIn.java     |  4 +---
 .../cassandra/net/MessagingServiceTest.java     | 20 ++++++++------------
 4 files changed, 13 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b93e96a9/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4b8eb25,15af77e..625810a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,11 -1,5 +1,12 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
  3.12
+  * Remove timing window in test case (CASSANDRA-12875)
   * Resolve unit testing without JCE security libraries installed (CASSANDRA-12945)
   * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946)
   * Add support for arithmetic operators (CASSANDRA-11935)


Mime
View raw message