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/bc246e13 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc246e13 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc246e13 Branch: refs/heads/trunk Commit: bc246e13261dff243e4d1d0dd4e954200b1a9330 Parents: 68371c6 a8052d7 Author: Jake Luciani <[email protected]> Authored: Mon Oct 6 10:38:03 2014 -0400 Committer: Jake Luciani <[email protected]> Committed: Mon Oct 6 10:38:03 2014 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/stress/generate/Partition.java | 7 +++++-- .../stress/operations/userdefined/SchemaInsert.java | 11 +++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
