cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 08 May 2014 16:05:36 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

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

Branch: refs/heads/trunk
Commit: 8dab582c2421b21f8d87a26f55941f1ee1f8b516
Parents: 3b299c4 d6f32e4
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Thu May 8 18:05:13 2014 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Thu May 8 18:05:13 2014 +0200

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 src/java/org/apache/cassandra/db/marshal/AbstractType.java     | 3 +--
 .../apache/cassandra/serializers/InetAddressSerializer.java    | 2 +-
 .../org/apache/cassandra/serializers/IntegerSerializer.java    | 6 +++---
 src/java/org/apache/cassandra/serializers/LongSerializer.java  | 2 +-
 .../org/apache/cassandra/serializers/TimestampSerializer.java  | 2 +-
 src/java/org/apache/cassandra/serializers/UUIDSerializer.java  | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/8dab582c/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5afe800,a6cbc18..057fd34
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,27 +1,21 @@@
 -2.0.9
 - * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067)
 - * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177)
 - * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
 - * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
 - * Fix disabling autocompaction (CASSANDRA-7187)
 - * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
 -
 -2.0.8
 +2.1.0-rc1
 + * Fix marking commitlogsegments clean (CASSANDRA-6959)
 + * Add snapshot "manifest" describing files included (CASSANDRA-6326)
 + * Parallel streaming for sstableloader (CASSANDRA-3668)
 + * Fix bugs in supercolumns handling (CASSANDRA-7138)
 + * Fix ClassClassException on composite dense tables (CASSANDRA-7112)
 + * Cleanup and optimize collation and slice iterators (CASSANDRA-7107)
 + * Upgrade NBHM lib (CASSANDRA-7128)
 + * Optimize netty server (CASSANDRA-6861)
 +Merged from 2.0:
   * Correctly delete scheduled range xfers (CASSANDRA-7143)
   * Make batchlog replica selection rack-aware (CASSANDRA-6551)
 - * Allow overriding cassandra-rackdc.properties file (CASSANDRA-7072)
 - * Set JMX RMI port to 7199 (CASSANDRA-7087)
 - * Use LOCAL_QUORUM for data reads at LOCAL_SERIAL (CASSANDRA-6939)
 - * Log a warning for large batches (CASSANDRA-6487)
 - * Queries on compact tables can return more rows that requested (CASSANDRA-7052)
 - * USING TIMESTAMP for batches does not work (CASSANDRA-7053)
 - * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949)
 - * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047)
 - * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074)
 - * Plug holes in resource release when wiring up StreamSession (CASSANDRA-7073)
 - * Re-add parameter columns to tracing session (CASSANDRA-6942)
 - * Fix writetime/ttl functions for static columns (CASSANDRA-7081)
   * Suggest CTRL-C or semicolon after three blank lines in cqlsh (CASSANDRA-7142)
 + * return all cpu values from BackgroundActivityMonitor.readAndCompute (CASSANDRA-7183)
 
 + * reduce garbage creation in calculatePendingRanges (CASSANDRA-7191)
 + * fix c* launch issues on Russian os's due to output of linux 'free' cmd (CASSANDRA-6162)
 + * Fix disabling autocompaction (CASSANDRA-7187)
++ * Fix potential NumberFormatException when deserializing IntegerType (CASSANDRA-7088)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8dab582c/src/java/org/apache/cassandra/db/marshal/AbstractType.java
----------------------------------------------------------------------


Mime
View raw message