Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17e13e5c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17e13e5c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17e13e5c Branch: refs/heads/trunk Commit: 17e13e5cf5aaf45c403a96de8d38cda091c20d2e Parents: 21a7a1c c35af2a Author: Benjamin Lerer <b.le...@gmail.com> Authored: Fri Nov 27 13:17:29 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Fri Nov 27 13:17:46 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/io/sstable/format/big/BigTableWriter.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/17e13e5c/CHANGES.txt ----------------------------------------------------------------------
