From 03278afe5914f8bef96d24f2481826d372d6f0ff Mon Sep 17 00:00:00 2001 From: Eric Evans Date: Wed, 24 Feb 2010 00:05:43 +0000 Subject: [PATCH] merge with 0.6 branch git-svn-id: https://svn.apache.org/repos/asf/incubator/cassandra/trunk@915602 13f79535-47bb-0310-9956-ffa450edef68 --- NEWS.txt | 5 +++++ debian/changelog | 6 ++++++ src/java/org/apache/cassandra/utils/FBUtilities.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/NEWS.txt b/NEWS.txt index 423ff8d41d..15cc64d6dc 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -27,6 +27,7 @@ Configuraton to occur after the specified number of operations. - Like MemtableSizeInMB, BinaryMemtableSizeInMB has been replaced by BinaryMemtableThroughputInMB. + - Replication factor is now per-keyspace, rather than global. Thrift API ---------- @@ -34,6 +35,10 @@ Thrift API - added batch_mutate meethod - deprecated multiget and batch_insert methods in favor of multiget_slice and batch_mutate, respectively + - added ConsistencyLevel.ANY, for when you want write + availability even when it may not be readable immediately. + Unlike CL.ZERO, though, it will throw an exception if + it cannot be written *somewhere*. JMX metrics ----------- diff --git a/debian/changelog b/debian/changelog index c54a5e9fa8..94c42e9623 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (0.6.0~beta2-1) unstable; urgency=low + + * New beta release. + + -- Eric Evans Tue, 23 Feb 2010 17:55:17 -0600 + cassandra (0.5.0-1) unstable; urgency=low * New stable release. diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index dd7b56f734..898ad380c7 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -50,7 +50,7 @@ public class FBUtilities public static final BigInteger TWO = new BigInteger("2"); - private static InetAddress localInetAddress_; + private static volatile InetAddress localInetAddress_; public static String[] strip(String string, String token) {