Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f73b4850 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f73b4850 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f73b4850 Branch: refs/heads/trunk Commit: f73b48502d8455ef27f915f5a5bc14a9682f8ab0 Parents: 54b7438 89344f1 Author: T Jake Luciani <j...@apache.org> Authored: Wed May 18 09:10:06 2016 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed May 18 09:10:06 2016 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/settings/SettingsPopulation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
