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/bb6b0d64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb6b0d64 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb6b0d64 Branch: refs/heads/trunk Commit: bb6b0d64edcc35958f95128f0996c4532bacc104 Parents: 027006d ed7eed8 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Oct 16 11:12:21 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Oct 16 11:12:21 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 4 +++ .../service/pager/AbstractQueryPager.java | 27 +++++++++++++++----- .../service/pager/SliceQueryPager.java | 10 +++++--- 3 files changed, 31 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb6b0d64/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 4237862,67b25dc..772b6ef --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,34 -1,6 +1,36 @@@ +3.0 + * Keep sstable levels when bootstrapping (CASSANDRA-7460) + * Add Sigar library and perform basic OS settings check on startup (CASSANDRA-7838) + * Support for aggregation functions (CASSANDRA-4914) + * Remove cassandra-cli (CASSANDRA-7920) + * Accept dollar quoted strings in CQL (CASSANDRA-7769) + * Make assassinate a first class command (CASSANDRA-7935) + * Support IN clause on any clustering column (CASSANDRA-4762) + * Improve compaction logging (CASSANDRA-7818) + * Remove YamlFileNetworkTopologySnitch (CASSANDRA-7917) + * Do anticompaction in groups (CASSANDRA-6851) + * Support pure user-defined functions (CASSANDRA-7395, 7526, 7562, 7740, 7781, 7929, + 7924, 7812, 8063) + * 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) + * Fail on very large batch sizes (CASSANDRA-8011) + * improve concurrency of repair (CASSANDRA-6455) + + 2.1.1 + * Fix ClassCastException in DISTINCT query on static columns with + query paging (CASSANDRA-8108) * Fix NPE on null nested UDT inside a set (CASSANDRA-8105) * Fix exception when querying secondary index on set items or map keys when some clustering columns are specified (CASSANDRA-8073)
