Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b636b074 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b636b074 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b636b074 Branch: refs/heads/trunk Commit: b636b0742372229bb518ef865fe88fcf529c3274 Parents: c4a5497 28e51d6 Author: Robert Stupp <sn...@snazy.de> Authored: Thu Nov 19 11:11:46 2015 +0100 Committer: Robert Stupp <sn...@snazy.de> Committed: Thu Nov 19 11:11:46 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/b636b074/CHANGES.txt ----------------------------------------------------------------------
