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/030aa57c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/030aa57c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/030aa57c Branch: refs/heads/trunk Commit: 030aa57cd254550f2c6e4eb36a050ea5bf3b4b16 Parents: 3329cd7 bb8cc62 Author: T Jake Luciani <j...@apache.org> Authored: Wed Oct 29 21:23:38 2014 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Wed Oct 29 21:23:38 2014 -0400 ---------------------------------------------------------------------- .../src/org/apache/cassandra/stress/settings/SettingsPort.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
