cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bened...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 18 Sep 2015 12:07:34 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/bcba9b7f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bcba9b7f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bcba9b7f

Branch: refs/heads/trunk
Commit: bcba9b7f6ebe8c8174f207d83ae373acf7eac7f7
Parents: bd60155 ff27eb3
Author: Benedict Elliott Smith <benedict@apache.org>
Authored: Fri Sep 18 13:06:34 2015 +0100
Committer: Benedict Elliott Smith <benedict@apache.org>
Committed: Fri Sep 18 13:06:34 2015 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/db/DeletionTime.java   |  2 +-
 .../org/apache/cassandra/db/RowIndexEntry.java  |  4 ++--
 .../cassandra/db/marshal/AbstractType.java      |  2 +-
 .../apache/cassandra/io/util/DataInputPlus.java | 21 ++++++++++++++-----
 .../org/apache/cassandra/io/util/FileUtils.java | 12 -----------
 .../io/util/RebufferingInputStream.java         | 22 +++++++++++++-------
 .../org/apache/cassandra/net/MessageIn.java     |  2 +-
 .../apache/cassandra/utils/ByteBufferUtil.java  |  6 +++---
 8 files changed, 38 insertions(+), 33 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/bcba9b7f/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
----------------------------------------------------------------------


Mime
View raw message