Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6298e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6298e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a6298e2 Branch: refs/heads/trunk Commit: 9a6298e296915113fcbf9d60dd8a997ace0e077d Parents: 0cdf2b3 f6c5e02 Author: Mikhail Stepura <mish...@apache.org> Authored: Fri Jun 20 14:15:40 2014 +1100 Committer: Mikhail Stepura <mish...@apache.org> Committed: Fri Jun 20 14:15:40 2014 +1100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/util/FastByteArrayOutputStream.java | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6298e2/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6298e2/src/java/org/apache/cassandra/io/util/FastByteArrayOutputStream.java ----------------------------------------------------------------------
