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/f3ec5b45 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3ec5b45 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f3ec5b45 Branch: refs/heads/trunk Commit: f3ec5b456044713b8fcc409f5144969d9781e923 Parents: f3ff8df 649a106 Author: Benedict Elliott Smith <[email protected]> Authored: Wed Sep 16 13:17:14 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Sep 16 13:17:14 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/batchlog/Batch.java | 16 ++++----- src/java/org/apache/cassandra/db/Columns.java | 6 ++-- src/java/org/apache/cassandra/db/Mutation.java | 6 ++-- .../org/apache/cassandra/db/ReadCommand.java | 6 ++-- .../cassandra/db/SerializationHeader.java | 36 ++++++++++---------- src/java/org/apache/cassandra/db/Slices.java | 6 ++-- src/java/org/apache/cassandra/db/TypeSizes.java | 2 +- .../db/filter/ClusteringIndexNamesFilter.java | 6 ++-- .../cassandra/db/filter/ColumnFilter.java | 6 ++-- .../apache/cassandra/db/filter/DataLimits.java | 30 ++++++++-------- .../apache/cassandra/db/filter/RowFilter.java | 6 ++-- .../apache/cassandra/db/rows/EncodingStats.java | 18 +++++----- .../rows/UnfilteredRowIteratorSerializer.java | 6 ++-- .../cassandra/hints/EncodedHintMessage.java | 4 +-- src/java/org/apache/cassandra/hints/Hint.java | 8 ++--- .../org/apache/cassandra/hints/HintMessage.java | 6 ++-- .../cassandra/io/util/DataOutputPlus.java | 8 ++--- .../apache/cassandra/utils/ByteBufferUtil.java | 8 ++--- 18 files changed, 92 insertions(+), 92 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f3ec5b45/src/java/org/apache/cassandra/utils/ByteBufferUtil.java ----------------------------------------------------------------------
