Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24a1a5d7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24a1a5d7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24a1a5d7 Branch: refs/heads/cassandra-2.2 Commit: 24a1a5d71923e723c035eed67bb3a64d658784ec Parents: d3e00ef 5d26943 Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Thu Jun 4 11:40:02 2015 -0500 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Thu Jun 4 11:40:02 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + pylib/cqlshlib/cqlhandling.py | 18 +++++++++++++++++- pylib/cqlshlib/pylexotron.py | 12 +++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24a1a5d7/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index af51a9d,928eb55..9aadeff --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,24 -1,5 +1,25 @@@ -2.1.6 +2.2 + * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400) + * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546) + * Empty INITCOND treated as null in aggregate (CASSANDRA-9457) + * Remove use of Cell in Thrift MapReduce classes (CASSANDRA-8609) + * Integrate pre-release Java Driver 2.2-rc1, custom build (CASSANDRA-9493) + * Clean up gossiper logic for old versions (CASSANDRA-9370) + * Fix custom payload coding/decoding to match the spec (CASSANDRA-9515) + * ant test-all results incomplete when parsed (CASSANDRA-9463) + * Disallow frozen<> types in function arguments and return types for + clarity (CASSANDRA-9411) + * Static Analysis to warn on unsafe use of Autocloseable instances (CASSANDRA-9431) + * Update commitlog archiving examples now that commitlog segments are + not recycled (CASSANDRA-9350) + * Extend Transactional API to sstable lifecycle management (CASSANDRA-8568) + * (cqlsh) Add support for native protocol 4 (CASSANDRA-9399) + * Ensure that UDF and UDAs are keyspace-isolated (CASSANDRA-9409) + * Revert CASSANDRA-7807 (tracing completion client notifications) (CASSANDRA-9429) + * Add ability to stop compaction by ID (CASSANDRA-7207) + * Let CassandraVersion handle SNAPSHOT version (CASSANDRA-9438) +Merged from 2.1: + * (cqlsh) Fix using COPY through SOURCE or -f (CASSANDRA-9083) * Fix occasional lack of `system` keyspace in schema tables (CASSANDRA-8487) * Use ProtocolError code instead of ServerError code for native protocol error responses to unsupported protocol versions (CASSANDRA-9451) http://git-wip-us.apache.org/repos/asf/cassandra/blob/24a1a5d7/pylib/cqlshlib/cqlhandling.py ----------------------------------------------------------------------