Merge branch '2.1-fixup' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bedd97f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bedd97f7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bedd97f7 Branch: refs/heads/cassandra-2.1 Commit: bedd97f7abea417c0165721888458e62392875e9 Parents: c45ed17 f852401 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Fri Dec 19 13:56:59 2014 +0000 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Fri Dec 19 13:56:59 2014 +0000 ---------------------------------------------------------------------- .../apache/cassandra/stress/generate/PartitionIterator.java | 7 +++---- .../cassandra/stress/operations/userdefined/SchemaInsert.java | 7 +------ .../cassandra/stress/operations/userdefined/SchemaQuery.java | 7 +------ 3 files changed, 5 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
