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/28e51d66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/28e51d66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/28e51d66 Branch: refs/heads/trunk Commit: 28e51d66f3b986989e2580869b428e7d48c253b1 Parents: d1103f5 747e5fd Author: Robert Stupp <[email protected]> Authored: Thu Nov 19 11:11:30 2015 +0100 Committer: Robert Stupp <[email protected]> Committed: Thu Nov 19 11:11:30 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/sstableloader | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/28e51d66/CHANGES.txt ----------------------------------------------------------------------
