Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/61e3fc76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/61e3fc76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/61e3fc76 Branch: refs/heads/trunk Commit: 61e3fc76a33f6012bedd31d4181f9ff88553ffe0 Parents: 3bf4be4 61c93e7 Author: Jason Brown <jasedbr...@gmail.com> Authored: Tue Jan 26 05:38:49 2016 -0800 Committer: Jason Brown <jasedbr...@gmail.com> Committed: Tue Jan 26 05:38:49 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/util/Memory.java | 2 +- src/java/org/apache/cassandra/utils/FastByteOperations.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/61e3fc76/CHANGES.txt ----------------------------------------------------------------------
