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/a0f59dce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0f59dce Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a0f59dce Branch: refs/heads/trunk Commit: a0f59dce5bb907dc8f4d08e17ac4e511cf5f81c7 Parents: 50f7e02 d877ba0 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Fri Dec 18 15:43:52 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Fri Dec 18 15:43:52 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + NOTICE.txt | 4 - build.xml | 2 - lib/jgrapht-core-0.9.1.jar | Bin 351208 -> 0 bytes lib/licenses/jgrapht-core-0.9.1.txt | 227 ------------------- src/java/org/apache/cassandra/schema/Types.java | 64 ++++-- 6 files changed, 47 insertions(+), 251 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f59dce/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d49a75f,e6ab5dd..6bbded8 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ -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 3.0: + * Eliminate the dependency on jgrapht for UDT resolution (CASSANDRA-10653) * (Hadoop) Close Clusters and Sessions in Hadoop Input/Output classes (CASSANDRA-1837) * Fix sstableloader not working with upper case keyspace name (CASSANDRA-10806) Merged from 2.2: http://git-wip-us.apache.org/repos/asf/cassandra/blob/a0f59dce/build.xml ----------------------------------------------------------------------
