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