Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a1879c2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a1879c2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a1879c2 Branch: refs/heads/trunk Commit: 4a1879c2359715577ed8d57563e33fd5fe51d869 Parents: 8501e51 213b066 Author: T Jake Luciani <j...@apache.org> Authored: Wed Mar 4 16:29:34 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Mar 4 16:29:34 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/settings/SettingsPopulation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
