cassandra-commits mailing list archives

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


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b1f0b07
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b1f0b07
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b1f0b07

Branch: refs/heads/cassandra-2.1
Commit: 1b1f0b0790cf4f36fddd6815634261ace6cb588e
Parents: 773b95e 16fd1a4
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Thu May 8 00:39:13 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Thu May 8 00:39:13 2014 -0400

----------------------------------------------------------------------
 CHANGES.txt           | 3 ++-
 conf/cassandra-env.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b1f0b07/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4a0548a,05cc193..f57b649
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,17 -1,25 +1,18 @@@
 -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)
 -
 -2.0.8
 +2.1.0-rc1
 + * 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)
++ * 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)
  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/1b1f0b07/conf/cassandra-env.sh
----------------------------------------------------------------------


Mime
View raw message