Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6d8d88c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6d8d88c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6d8d88c Branch: refs/heads/trunk Commit: f6d8d88ce3b54e3afdc41b30e2055d974594ac0c Parents: 3fededc 4ce409e Author: Benedict Elliott Smith <[email protected]> Authored: Thu Mar 5 20:07:19 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Thu Mar 5 20:07:19 2015 +0000 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6d8d88c/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java ----------------------------------------------------------------------
