cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Date Thu, 05 Jun 2014 18:22:42 GMT
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/transport/CBUtil.java


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

Branch: refs/heads/trunk
Commit: 8a91a1a59e8fe49e49c6ccb1044dbb9606e13aff
Parents: 7b24b87 4722fe7
Author: Jake Luciani <jake@apache.org>
Authored: Thu Jun 5 14:22:19 2014 -0400
Committer: Jake Luciani <jake@apache.org>
Committed: Thu Jun 5 14:22:19 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 build.xml                                       |   2 +-
 lib/netty-all-4.0.17.Final.jar                  | Bin 1613159 -> 0 bytes
 lib/netty-all-4.0.19.Final.jar                  | Bin 0 -> 1678810 bytes
 .../cql3/statements/ModificationStatement.java  |  12 +-
 .../apache/cassandra/db/CounterMutation.java    |  12 ++
 src/java/org/apache/cassandra/db/IMutation.java |  11 ++
 src/java/org/apache/cassandra/db/Mutation.java  |  37 +++-
 .../apache/cassandra/net/MessagingService.java  |  20 +-
 .../cassandra/net/ResponseVerbHandler.java      |   7 +
 .../apache/cassandra/service/QueryState.java    |  12 ++
 .../apache/cassandra/service/StorageProxy.java  | 197 ++++++++++++-------
 .../org/apache/cassandra/transport/CBUtil.java  |  11 +-
 .../org/apache/cassandra/transport/Frame.java   |  14 +-
 .../cassandra/transport/FrameCompressor.java    |   8 +-
 .../org/apache/cassandra/transport/Message.java |  13 +-
 .../org/apache/cassandra/utils/ExpiringMap.java |  10 +-
 17 files changed, 262 insertions(+), 105 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a91a1a5/build.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a91a1a5/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8a91a1a5/src/java/org/apache/cassandra/transport/FrameCompressor.java
----------------------------------------------------------------------


Mime
View raw message