cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [2/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Date Thu, 13 Aug 2015 12:42:36 GMT
Merge branch 'cassandra-2.2' into cassandra-3.0

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/6e2cf572
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e2cf572
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e2cf572

Branch: refs/heads/trunk
Commit: 6e2cf57202120e9d6fcb112aaf8d5f836ce1e500
Parents: 0ff2a5b 9a6ee93
Author: Jason Brown <jasedbrown@gmail.com>
Authored: Thu Aug 13 05:41:46 2015 -0700
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Thu Aug 13 05:41:46 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 +
 .../cassandra/metrics/ConnectionMetrics.java    | 30 ++++++++++++++++++++
 .../org/apache/cassandra/net/MessageOut.java    |  2 +-
 .../apache/cassandra/net/MessagingService.java  | 24 ++++++++++++++++
 .../cassandra/net/MessagingServiceMBean.java    | 15 ++++++++++
 .../net/OutboundTcpConnectionPool.java          | 14 +++++++--
 .../cassandra/tools/nodetool/NetStats.java      |  8 ++++++
 7 files changed, 90 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e2cf572/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index d7e84bf,3b548e5..2a9b89b
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,22 -1,12 +1,23 @@@
 -2.2.1
 +3.0.0-beta1
+  * Route gossip messages over dedicated socket (CASSANDRA-9237)
 + * Add option to only purge repaired tombstones (CASSANDRA-6434)
 + * Change authorization handling for MVs (CASSANDRA-9927)
 + * Add custom JMX enabled executor for UDF sandbox (CASSANDRA-10026)
 + * Fix row deletion bug for Materialized Views (CASSANDRA-10014)
 + * Support mixed-version clusters with Cassandra 2.1 and 2.2 (CASSANDRA-9704)
 + * Fix multiple slices on RowSearchers (CASSANDRA-10002)
 + * Fix bug in merging of collections (CASSANDRA-10001)
 + * Optimize batchlog replay to avoid full scans (CASSANDRA-7237)
 + * Repair improvements when using vnodes (CASSANDRA-5220)
 + * Disable scripted UDFs by default (CASSANDRA-9889)
 + * Bytecode inspection for Java-UDFs (CASSANDRA-9890)
 + * Use byte to serialize MT hash length (CASSANDRA-9792)
 + * Replace usage of Adler32 with CRC32 (CASSANDRA-8684)
 + * Fix migration to new format from 2.1 SSTable (CASSANDRA-10006)
 +Merged from 2.2:
   * Add checksum to saved cache files (CASSANDRA-9265)
   * Log warning when using an aggregate without partition key (CASSANDRA-9737)
 - * Avoid grouping sstables for anticompaction with DTCS (CASSANDRA-9900)
 - * UDF / UDA execution time in trace (CASSANDRA-9723)
 - * Fix broken internode SSL (CASSANDRA-9884)
  Merged from 2.1:
 - * Add new JMX methods to change local compaction strategy (CASSANDRA-9965)
   * Write hints for paxos commits (CASSANDRA-7342)
   * (cqlsh) Fix timestamps before 1970 on Windows, always
     use UTC for timestamp display (CASSANDRA-10000)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e2cf572/src/java/org/apache/cassandra/net/MessageOut.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6e2cf572/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------


Mime
View raw message