cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [6/6] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Date Fri, 17 Jul 2015 13:40:56 GMT
Merge branch 'cassandra-2.2' into trunk

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/05a5fb4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05a5fb4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05a5fb4f

Branch: refs/heads/trunk
Commit: 05a5fb4f8b7bf76be0d95196a3231c5be61ee978
Parents: 412e874 f60e4ad
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jul 17 15:40:40 2015 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jul 17 15:40:40 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                     |  4 +++-
 .../cassandra/io/util/SequentialWriter.java     | 22 ++++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/05a5fb4f/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index db306ea,47d1db5..b2abd10
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,34 -1,15 +1,36 @@@
 +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
+  * 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)
  Merged from 2.1:
   * Fix broken logging for "empty" flushes in Memtable (CASSANDRA-9837)
   * Handle corrupt files on startup (CASSANDRA-9686)
   * Fix clientutil jar and tests (CASSANDRA-9760)
   * (cqlsh) Allow the SSL protocol version to be specified through the
 -   config file or environment variables (CASSANDRA-9544)
 +    config file or environment variables (CASSANDRA-9544)
  Merged from 2.0:
+  * Complete CASSANDRA-8448 fix (CASSANDRA-9519)
   * Don't include auth credentials in debug log (CASSANDRA-9682)
   * Can't transition from write survey to normal mode (CASSANDRA-9740)
   * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/05a5fb4f/src/java/org/apache/cassandra/io/util/SequentialWriter.java
----------------------------------------------------------------------


Mime
View raw message