Merge branch 'cassandra-2.1' into trunk
Conflicts:
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/111f0c0f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/111f0c0f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/111f0c0f
Branch: refs/heads/trunk
Commit: 111f0c0f91e679145dd27b3123de78bac3e41156
Parents: d5265bb 04944f0
Author: Aleksey Yeschenko <[email protected]>
Authored: Tue Jul 8 20:21:26 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Tue Jul 8 20:21:26 2014 +0300
----------------------------------------------------------------------
.rat-excludes | 2 ++
CHANGES.txt | 2 +-
build.xml | 2 +-
debian/changelog | 12 ++++++++
.../apache/cassandra/db/BufferExpiringCell.java | 4 +--
.../apache/cassandra/db/NativeExpiringCell.java | 4 +--
.../AbstractSimplePerColumnSecondaryIndex.java | 5 ++--
.../db/index/SecondaryIndexManager.java | 31 ++++++++++----------
test/unit/org/apache/cassandra/db/CellTest.java | 21 +++++++++++++
.../stress/generate/DistributionInverted.java | 21 +++++++++++++
.../cassandra/stress/generate/Partition.java | 21 +++++++++++++
.../stress/generate/PartitionGenerator.java | 21 +++++++++++++
.../stress/generate/RatioDistribution.java | 21 +++++++++++++
.../apache/cassandra/stress/generate/Row.java | 21 +++++++++++++
.../stress/generate/SeedGenerator.java | 21 +++++++++++++
.../stress/generate/SeedRandomGenerator.java | 21 +++++++++++++
.../stress/generate/SeedSeriesGenerator.java | 21 +++++++++++++
.../stress/generate/values/Generator.java | 21 +++++++++++++
.../stress/operations/FixedOpDistribution.java | 21 +++++++++++++
.../stress/operations/OpDistribution.java | 21 +++++++++++++
.../operations/OpDistributionFactory.java | 21 +++++++++++++
.../operations/SampledOpDistribution.java | 21 +++++++++++++
.../SampledOpDistributionFactory.java | 21 +++++++++++++
.../operations/userdefined/SchemaInsert.java | 21 +++++++++++++
.../operations/userdefined/SchemaQuery.java | 21 +++++++++++++
.../operations/userdefined/SchemaStatement.java | 21 +++++++++++++
.../stress/settings/OptionAnyProbabilities.java | 21 +++++++++++++
.../settings/OptionEnumProbabilities.java | 21 +++++++++++++
.../stress/settings/ValidationType.java | 21 +++++++++++++
29 files changed, 480 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/111f0c0f/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/111f0c0f/build.xml
----------------------------------------------------------------------
