cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [08/10] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Thu, 12 Jun 2014 19:46:37 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/6c8271f6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c8271f6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6c8271f6

Branch: refs/heads/cassandra-2.1
Commit: 6c8271f60a3c3e8a2f1e841542bbb58c9073c140
Parents: c94caec daf6f68
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Thu Jun 12 14:45:58 2014 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Thu Jun 12 14:45:58 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                             |  2 ++
 .../org/apache/cassandra/config/DatabaseDescriptor.java | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c8271f6/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cc968c3,a2a978e..1b320fb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,23 -1,23 +1,25 @@@
 -2.0.9
 +2.1.0
 + * Fix exception when querying a composite-keyed table with a collection index
 +   (CASSANDRA-7372)
 + * Use node's host id in place of counter ids (CASSANDRA-7366)
   * Fix native protocol CAS batches (CASSANDRA-7337)
 + * Reduce likelihood of contention on local paxos locking (CASSANDRA-7359)
 + * Upgrade to Pig 0.12.1 (CASSANDRA-6556)
 + * Make sure we clear out repair sessions from netstats (CASSANDRA-7329)
 + * Don't fail streams on failure detector downs (CASSANDRA-3569)
 + * Add optional keyspace to DROP INDEX statement (CASSANDRA-7314)
 + * Reduce run time for CQL tests (CASSANDRA-7327)
 + * Fix heap size calculation on Windows (CASSANDRA-7352)
 + * RefCount native frames from netty (CASSANDRA-7245)
 + * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
 +Merged from 2.0:
   * Add per-CF range read request latency metrics (CASSANDRA-7338)
   * Fix NPE in StreamTransferTask.createMessageForRetry() (CASSANDRA-7323)
 - * Add conditional CREATE/DROP USER support (CASSANDRA-7264)
 - * Swap local and global default read repair chances (CASSANDRA-7320)
 - * Add missing iso8601 patterns for date strings (CASSANDRA-6973)
 - * Support selecting multiple rows in a partition using IN (CASSANDRA-6875)
 - * cqlsh: always emphasize the partition key in DESC output (CASSANDRA-7274)
 - * Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
 - * Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
 - * Don't try to compact already-compacting files in HHOM (CASSANDRA-7288)
 - * Add authentication support to shuffle (CASSANDRA-6484)
 - * Cqlsh counts non-empty lines for "Blank lines" warning (CASSANDRA-7325)
   * Make StreamSession#closeSession() idempotent (CASSANDRA-7262)
   * Fix infinite loop on exception while streaming (CASSANDRA-7330)
 - * Reference sstables before populating key cache (CASSANDRA-7234)
  Merged from 1.2:
+ 1.2.17
+  * Add replace_address_first_boot flag to only replace if not bootstrapped (CASSANDRA-7356)
   * Enable keepalive for native protocol (CASSANDRA-7380)
   * Check internal addresses for seeds (CASSANDRA-6523)
   * Fix potential / by 0 in HHOM page size calculation (CASSANDRA-7354)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6c8271f6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
----------------------------------------------------------------------


Mime
View raw message