Merge branch cassandra-3.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/abf7df3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/abf7df3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/abf7df3b Branch: refs/heads/trunk Commit: abf7df3bd609f999fdcc2dcfb91688be50c46664 Parents: 80250aa 363e7bd Author: Benjamin Lerer <b.le...@gmail.com> Authored: Wed Dec 16 15:20:53 2015 +0100 Committer: Benjamin Lerer <b.le...@gmail.com> Committed: Wed Dec 16 15:21:07 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/stress/StressProfile.java | 8 ++++ .../stress/generate/values/LocalDates.java | 43 +++++++++++++++++++ .../stress/generate/values/SmallInts.java | 38 +++++++++++++++++ .../cassandra/stress/generate/values/Times.java | 37 ++++++++++++++++ .../stress/generate/values/TinyInts.java | 45 ++++++++++++++++++++ .../operations/userdefined/SchemaStatement.java | 16 +++++-- .../cassandra/stress/util/JavaDriverClient.java | 1 + 8 files changed, 185 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/abf7df3b/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 062ab10,10504c7..24b2662 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,26 -1,11 +1,27 @@@ -3.0.3 +3.2 + * Establish bootstrap stream sessions sequentially (CASSANDRA-6992) + * Sort compactionhistory output by timestamp (CASSANDRA-10464) + * More efficient BTree removal (CASSANDRA-9991) + * Make tablehistograms accept the same syntax as tablestats (CASSANDRA-10149) + * Group pending compactions based on table (CASSANDRA-10718) + * Add compressor name in sstablemetadata output (CASSANDRA-9879) + * Fix type casting for counter columns (CASSANDRA-10824) + * Prevent running Cassandra as root (CASSANDRA-8142) + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639) + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) Merged from 2.2: + * Add new types to Stress (CASSANDRA-9556) * Add property to allow listening on broadcast interface (CASSANDRA-9748) - * Fix regression in split size on CqlInputFormat (CASSANDRA-10835) - * Better handling of SSL connection errors inter-node (CASSANDRA-10816) - * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474) - * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761) Merged from 2.1: * (cqlsh) further optimise COPY FROM (CASSANDRA-9302) * Allow CREATE TABLE WITH ID (CASSANDRA-9179)
