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/718c4789 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/718c4789 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/718c4789 Branch: refs/heads/trunk Commit: 718c4789c90c25b676f04437b3a31c30b4b460cf Parents: a38f362 9c9f263 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Nov 5 22:32:34 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Nov 5 22:32:34 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/hadoop/cql3/CqlInputFormat.java | 22 ++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/718c4789/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 14b6007,b469594..72dc800 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * 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) + + 3.0 + * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600) * Fix reading of legacy sstables (CASSANDRA-10590) * Use CQL type names in schema metadata tables (CASSANDRA-10365) * Guard batchlog replay against integer division by zero (CASSANDRA-9223)
