cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mish...@apache.org
Subject [7/8] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Fri, 16 May 2014 02:30:19 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/b9c9039a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9c9039a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9c9039a

Branch: refs/heads/cassandra-2.1
Commit: b9c9039a1965730c294b179934e82cfdfdeb3662
Parents: 33bc1e8 a01eb5a
Author: Mikhail Stepura <mishail@apache.org>
Authored: Thu May 15 19:27:32 2014 -0700
Committer: Mikhail Stepura <mishail@apache.org>
Committed: Thu May 15 19:28:47 2014 -0700

----------------------------------------------------------------------
 CHANGES.txt                                       | 1 +
 src/java/org/apache/cassandra/tools/NodeTool.java | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9c9039a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 4b9085a,30e45c1..223f331
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -32,6 -12,25 +32,7 @@@ Merged from 2.0
   * cqlsh: Accept and execute CQL statement(s) from command-line parameter (CASSANDRA-7172)
   * Fix IllegalStateException in CqlPagingRecordReader (CASSANDRA-7198)
   * Fix the InvertedIndex trigger example (CASSANDRA-7211)
+  * Add --resolve-ip option to 'nodetool ring' (CASSANDRA-7210)
 -
 -
 -2.0.8
 - * 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)
  Merged from 1.2:
   * Add Cloudstack snitch (CASSANDRA-7147)
   * Update system.peers correctly when relocating tokens (CASSANDRA-7126)


Mime
View raw message