Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/700a1dcb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/700a1dcb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/700a1dcb Branch: refs/heads/trunk Commit: 700a1dcb555f5de01fd80e2f53e5b8e905e43efe Parents: 49b0805 8c95d37 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Oct 4 16:23:10 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Oct 4 16:23:10 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/StressCQLSSTableWriter.java | 8 +++++--- .../src/org/apache/cassandra/stress/Stress.java | 2 +- .../org/apache/cassandra/stress/StressProfile.java | 14 +++++++------- 4 files changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/700a1dcb/CHANGES.txt ----------------------------------------------------------------------
