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/e6c5982f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6c5982f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6c5982f Branch: refs/heads/trunk Commit: e6c5982fa3b9d3483319e2fcc7bf3c1a7980a7e9 Parents: 8a38ce8 f852401 Author: Benedict Elliott Smith <[email protected]> Authored: Wed Dec 17 09:28:17 2014 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Dec 17 09:28:17 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(-) ----------------------------------------------------------------------
