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/e3945487 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e3945487 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e3945487 Branch: refs/heads/trunk Commit: e3945487331359a91c49d34015b52f79e5b30b1c Parents: b19ece1 df7c658 Author: Sylvain Lebresne <[email protected]> Authored: Fri Oct 30 14:42:35 2015 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Fri Oct 30 14:42:35 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/LegacyLayout.java | 28 +++++++++++++------- .../cassandra/db/context/CounterContext.java | 16 +++++++++++ 3 files changed, 35 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e3945487/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4106b64,72f48f5..71330e1 --- 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 + * Fix backward compatibility for counters (CASSANDRA-10470) * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581) * Execute the metadata reload task of all registered indexes on CFS::reload (CASSANDRA-10604) * Fix thrift cas operations with defined columns (CASSANDRA-10576)
