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/2da468d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2da468d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2da468d9 Branch: refs/heads/trunk Commit: 2da468d9bbcf66a0635fb39d26da83d7349829a8 Parents: 81c9308 def6b5f Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri May 8 16:09:04 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri May 8 16:09:04 2015 -0400 ---------------------------------------------------------------------- .../stress/src/org/apache/cassandra/stress/util/DynamicList.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ----------------------------------------------------------------------