Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a8c50b81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a8c50b81 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a8c50b81 Branch: refs/heads/trunk Commit: a8c50b814b148329837631182309c648d4836da4 Parents: 76480b3 fcb5bd6 Author: Robert Stupp <[email protected]> Authored: Mon Jul 27 22:39:01 2015 +0200 Committer: Robert Stupp <[email protected]> Committed: Mon Jul 27 22:39:31 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 5 ++--- .../apache/cassandra/thrift/CassandraServer.java | 18 ++++++++++++------ .../transport/messages/BatchMessage.java | 11 +++++++++-- .../transport/messages/ExecuteMessage.java | 4 ++++ .../transport/messages/QueryMessage.java | 4 ++++ 5 files changed, 31 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8c50b81/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index e3323f7,36d0485..2db4115 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,31 -1,3 +1,28 @@@ +3.0 - <<<<<<< HEAD + * Implement proper sandboxing for UDFs (CASSANDRA-9402) - ======= + * Simplify (and unify) cleanup of compaction leftovers (CASSANDRA-7066) - >>>>>>> Introduce safer durable sstable membership management + * Allow extra schema definitions in cassandra-stress yaml (CASSANDRA-9850) + * Metrics should use up to date nomenclature (CASSANDRA-9448) + * Change CREATE/ALTER TABLE syntax for compression (CASSANDRA-8384) + * Cleanup crc and adler code for java 8 (CASSANDRA-9650) + * Storage engine refactor (CASSANDRA-8099, 9743, 9746, 9759, 9781, 9808, 9825, 9848, + 9705, 9859, 9867, 9874, 9828, 9801) + * Update Guava to 18.0 (CASSANDRA-9653) + * Bloom filter false positive ratio is not honoured (CASSANDRA-8413) + * New option for cassandra-stress to leave a ratio of columns null (CASSANDRA-9522) + * Change hinted_handoff_enabled yaml setting, JMX (CASSANDRA-9035) + * Add algorithmic token allocation (CASSANDRA-7032) + * Add nodetool command to replay batchlog (CASSANDRA-9547) + * Make file buffer cache independent of paths being read (CASSANDRA-8897) + * Remove deprecated legacy Hadoop code (CASSANDRA-9353) + * Decommissioned nodes will not rejoin the cluster (CASSANDRA-8801) + * Change gossip stabilization to use endpoit size (CASSANDRA-9401) + * Change default garbage collector to G1 (CASSANDRA-7486) + * Populate TokenMetadata early during startup (CASSANDRA-9317) + * undeprecate cache recentHitRate (CASSANDRA-6591) + * Add support for selectively varint encoding fields (CASSANDRA-9499) + + 2.2.1 * UDF / UDA execution time in trace (CASSANDRA-9723) * Remove repair snapshot leftover on startup (CASSANDRA-7357) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8c50b81/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a8c50b81/src/java/org/apache/cassandra/transport/messages/QueryMessage.java ----------------------------------------------------------------------
