Merge branch 'cassandra-2.2' into cassandra-3.0

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

Branch: refs/heads/trunk
Commit: 299782cff5a56db8b8fe9ad70a43bea7b729cc99
Parents: 236c47e 49adbe7
Author: Branimir Lambov <branimir.lam...@datastax.com>
Authored: Tue Aug 21 11:55:38 2018 +0300
Committer: Branimir Lambov <branimir.lam...@datastax.com>
Committed: Tue Aug 21 11:55:38 2018 +0300

----------------------------------------------------------------------
 .../io/sstable/IndexSummaryBuilder.java         |  4 +-
 .../cassandra/io/util/DataOutputBuffer.java     |  8 +-
 .../io/util/DataOutputBufferFixed.java          |  2 +-
 .../cassandra/io/util/SafeMemoryWriter.java     | 16 ++--
 .../cassandra/io/util/DataOutputTest.java       |  4 +-
 .../cassandra/io/util/SafeMemoryWriterTest.java | 90 ++++++++++++++++++++
 6 files changed, 110 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/299782cf/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/299782cf/src/java/org/apache/cassandra/io/util/DataOutputBuffer.java
----------------------------------------------------------------------


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to