Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fc486a1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fc486a1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fc486a1 Branch: refs/heads/trunk Commit: 5fc486a1c6a05ba16953c66a17f01ea5bad978e5 Parents: e5d1528 25eb830 Author: Marcus Eriksson <marc...@apache.org> Authored: Sat Sep 13 17:27:53 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Sat Sep 13 17:27:53 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/tools/SSTableRepairedAtSetter.java | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc486a1/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index a05b91b,fdf6fbe..ec32ee6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +3.0 + * Support Java source code for user-defined functions (CASSANDRA-7562) + * Require arg types to disambiguate UDF drops (CASSANDRA-7812) + * Do anticompaction in groups (CASSANDRA-6851) + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395, 7740) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Don't try to set repairedAt on old sstables (CASSANDRA-7913) * Add metrics for tracking PreparedStatement use (CASSANDRA-7719) * (cqlsh) tab-completion for triggers (CASSANDRA-7824) * (cqlsh) Support for query paging (CASSANDRA-7514) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5fc486a1/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java ----------------------------------------------------------------------
