Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/050516c5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/050516c5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/050516c5 Branch: refs/heads/trunk Commit: 050516c534501d370d2f2f1295b19c5ccef6462e Parents: f244361 ad54683 Author: T Jake Luciani <[email protected]> Authored: Wed May 18 09:12:53 2016 -0400 Committer: T Jake Luciani <[email protected]> Committed: Wed May 18 09:12:53 2016 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/settings/SettingsPopulation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
