cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Thu, 10 Dec 2015 17:43:25 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 1299ec31904ea30513c28a48b92b35659b7267df
Parents: 425dc5f a7a0388
Author: Joshua McKenzie <jmckenzie@apache.org>
Authored: Thu Dec 10 12:41:46 2015 -0500
Committer: Joshua McKenzie <jmckenzie@apache.org>
Committed: Thu Dec 10 12:41:46 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 ++
 .../apache/cassandra/hadoop/ConfigHelper.java   | 26 +++++++++++++++++++-
 .../cassandra/hadoop/cql3/CqlInputFormat.java   | 17 ++++++++-----
 .../apache/cassandra/net/MessagingService.java  |  6 +++++
 .../cassandra/net/OutboundTcpConnection.java    |  9 +++++++
 5 files changed, 53 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1299ec31/CHANGES.txt
----------------------------------------------------------------------

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


Mime
View raw message