Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/34962c30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34962c30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34962c30 Branch: refs/heads/trunk Commit: 34962c300fe357283b066bd76dccf1ced55613e2 Parents: 0603af9 46ea040 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Wed Jun 3 17:02:08 2015 +0100 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Wed Jun 3 17:02:08 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../io/sstable/SSTableSimpleUnsortedWriter.java | 19 +++++++++---- .../io/sstable/CQLSSTableWriterTest.java | 29 ++++++++++++++++++++ 3 files changed, 44 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/34962c30/CHANGES.txt ----------------------------------------------------------------------
