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/b2d16f4c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2d16f4c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2d16f4c Branch: refs/heads/trunk Commit: b2d16f4cdd1c3441b6f39ad10786b36ddc69730d Parents: 4a1879c 4176f9e Author: T Jake Luciani <j...@apache.org> Authored: Wed Mar 4 16:37:17 2015 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Mar 4 16:37:17 2015 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/settings/SettingsPopulation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
