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/c69f257f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c69f257f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c69f257f Branch: refs/heads/trunk Commit: c69f257f9e5f14ce36f0aa8e91bc7eb13ce2d7b8 Parents: 96addee a323a1a Author: Mikhail Stepura <mish...@apache.org> Authored: Tue Aug 19 13:23:30 2014 -0700 Committer: Mikhail Stepura <mish...@apache.org> Committed: Tue Aug 19 13:23:30 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 50 ++++++++-------- pylib/cqlshlib/async_insert.py | 110 ++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c69f257f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 283ce8d,6facab9..5655d39 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,22 -1,5 +1,23 @@@ +3.0 + * Verify that UDF class methods are static (CASSANDRA-7781) + * Support pure user-defined functions (CASSANDRA-7395) + * 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) COPY TO/FROM improvements (CASSANDRA-7405) * Support list index operations with conditions (CASSANDRA-7499) * Add max live/tombstoned cells to nodetool cfstats output (CASSANDRA-7731) * Validate IPv6 wildcard addresses properly (CASSANDRA-7680)
