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/b3178743 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3178743 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b3178743 Branch: refs/heads/trunk Commit: b31787435a44fa8168fd18b4bfeb1d06544fb3af Parents: bf52074 d01250d Author: Mikhail Stepura <mish...@apache.org> Authored: Wed Aug 27 15:44:23 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Wed Aug 27 15:44:23 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 27 +++++++++-------- pylib/cqlshlib/async_insert.py | 13 ++++---- pylib/cqlshlib/meter.py | 59 +++++++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b3178743/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d33af9a,4fb773d..f04d6c5 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,23 -1,5 +1,24 @@@ +3.0 + * 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 + * (cqlsh): Show progress of COPY operations (CASSANDRA-7789) * Add syntax to remove multiple elements from a map (CASSANDRA-6599) * Support non-equals conditions in lightweight transactions (CASSANDRA-6839) * Add IF [NOT] EXISTS to create/drop triggers (CASSANDRA-7606)
