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/107f141e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/107f141e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/107f141e Branch: refs/heads/trunk Commit: 107f141e0964ea305cc3ffbdbfcbc3d9bfc58ba1 Parents: 05a5fb4 9dc8c21 Author: T Jake Luciani <j...@apache.org> Authored: Fri Jul 17 13:03:19 2015 -0400 Committer: T Jake Luciani <j...@apache.org> Committed: Fri Jul 17 13:03:19 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2632 +---------------- bin/cqlsh.bat | 2 +- bin/cqlsh.py | 2668 ++++++++++++++++++ pylib/cqlshlib/formatting.py | 4 + .../serializers/TimestampSerializer.java | 24 +- 6 files changed, 2698 insertions(+), 2633 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/107f141e/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b2abd10,616a387..e3eb5ff --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,25 -1,5 +1,26 @@@ +3.0 + * 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) + * 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.0-rc3 + * Fix cqlsh copy methods and other windows specific issues (CASSANDRA-9795) * Don't wrap byte arrays in SequentialWriter (CASSANDRA-9797) * sum() and avg() functions missing for smallint and tinyint types (CASSANDRA-9671) * Revert CASSANDRA-9542 (allow native functions in UDA) (CASSANDRA-9771)
