Merge branch 'cassandra-2.1.0' 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/04944f0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04944f0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04944f0c Branch: refs/heads/cassandra-2.1 Commit: 04944f0ca990254aa51ee5f3791717db15437a89 Parents: ec38458 0bc9841 Author: Aleksey Yeschenko <[email protected]> Authored: Tue Jul 8 20:17:36 2014 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Jul 8 20:18:24 2014 +0300 ---------------------------------------------------------------------- .rat-excludes | 2 ++ CHANGES.txt | 2 +- build.xml | 2 +- debian/changelog | 6 ++++ .../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, 474 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04944f0c/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a64eca3,641326e..6421b6f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,9 -1,3 +1,10 @@@ +2.1.1 + * Improve schema merge performance (CASSANDRA-7444) + * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + ++ 2.1.0-rc3 * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403) * Introduce CQL support for stress tool (CASSANDRA-6146) http://git-wip-us.apache.org/repos/asf/cassandra/blob/04944f0c/build.xml ----------------------------------------------------------------------
