Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89344f18 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89344f18 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89344f18 Branch: refs/heads/cassandra-3.7 Commit: 89344f182aac51e2047c7d4309c6cc5ed4a0b373 Parents: e8e917f 9359af2 Author: T Jake Luciani <j...@apache.org> Authored: Wed May 18 09:09:43 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed May 18 09:09:43 2016 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/settings/SettingsPopulation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
