You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/12/12 18:57:19 UTC
[1/4] git commit: Update versions for 1.2.13 release
Updated Branches:
refs/heads/trunk 706058c78 -> 56e484232
Update versions for 1.2.13 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ab82a46
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ab82a46
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ab82a46
Branch: refs/heads/trunk
Commit: 6ab82a46984ccbf5eed4244ceef6fa30d781eebb
Parents: faa9d51
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Dec 11 15:17:25 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Dec 11 15:17:25 2013 +0100
----------------------------------------------------------------------
NEWS.txt | 9 +++++++++
build.xml | 2 +-
debian/changelog | 6 ++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ab82a46/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 915729a..6293448 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -14,6 +14,15 @@ restore snapshots created with the previous major version using the
using the provided 'sstableupgrade' tool.
+1.2.13
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 1.2.12 if you are upgrading
+ from a previous version.
+
+
1.2.12
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ab82a46/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8efb7a3..23f8c71 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="1.2.12"/>
+ <property name="base.version" value="1.2.13"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ab82a46/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 93894b1..b419cb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.13) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Wed, 11 Dec 2013 15:16:39 +0100
+
cassandra (1.2.12) unstable; urgency=low
* New release
[4/4] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/56e48423
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/56e48423
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/56e48423
Branch: refs/heads/trunk
Commit: 56e4842321a1158be2f1f738205c56c6e5b82d73
Parents: 706058c f5526d5
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 12 20:57:09 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 12 20:57:09 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e48423/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/56e48423/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[3/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by al...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
NEWS.txt
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f5526d54
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f5526d54
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f5526d54
Branch: refs/heads/trunk
Commit: f5526d5405630a6b7af3ce9e24e102f38d1c268e
Parents: c99734c f7f7598
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 12 20:56:30 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 12 20:56:30 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5526d54/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e0338db,fa48a27..30f863e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -22,45 -16,10 +22,46 @@@ Merged from 1.2
(CASSANDRA-6413)
* (Hadoop) add describe_local_ring (CASSANDRA-6268)
* Fix handling of concurrent directory creation failure (CASSANDRA-6459)
+ * Randomize batchlog candidates selection (CASSANDRA-6481)
-1.2.12
+2.0.3
+ * Fix FD leak on slice read path (CASSANDRA-6275)
+ * Cancel read meter task when closing SSTR (CASSANDRA-6358)
+ * free off-heap IndexSummary during bulk (CASSANDRA-6359)
+ * Recover from IOException in accept() thread (CASSANDRA-6349)
+ * Improve Gossip tolerance of abnormally slow tasks (CASSANDRA-6338)
+ * Fix trying to hint timed out counter writes (CASSANDRA-6322)
+ * Allow restoring specific columnfamilies from archived CL (CASSANDRA-4809)
+ * Avoid flushing compaction_history after each operation (CASSANDRA-6287)
+ * Fix repair assertion error when tombstones expire (CASSANDRA-6277)
+ * Skip loading corrupt key cache (CASSANDRA-6260)
+ * Fixes for compacting larger-than-memory rows (CASSANDRA-6274)
+ * Compact hottest sstables first and optionally omit coldest from
+ compaction entirely (CASSANDRA-6109)
+ * Fix modifying column_metadata from thrift (CASSANDRA-6182)
+ * cqlsh: fix LIST USERS output (CASSANDRA-6242)
+ * Add IRequestSink interface (CASSANDRA-6248)
+ * Update memtable size while flushing (CASSANDRA-6249)
+ * Provide hooks around CQL2/CQL3 statement execution (CASSANDRA-6252)
+ * Require Permission.SELECT for CAS updates (CASSANDRA-6247)
+ * New CQL-aware SSTableWriter (CASSANDRA-5894)
+ * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
+ * Correctly throw error when frame too large (CASSANDRA-5981)
+ * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299)
+ * Fix CQL3 table validation in Thrift (CASSANDRA-6140)
+ * Fix bug missing results with IN clauses (CASSANDRA-6327)
+ * Fix paging with reversed slices (CASSANDRA-6343)
+ * Set minTimestamp correctly to be able to drop expired sstables (CASSANDRA-6337)
+ * Support NaN and Infinity as float literals (CASSANDRA-6003)
+ * Remove RF from nodetool ring output (CASSANDRA-6289)
+ * Fix attempting to flush empty rows (CASSANDRA-6374)
+ * Fix potential out of bounds exception when paging (CASSANDRA-6333)
+Merged from 1.2:
+ * Optimize FD phi calculation (CASSANDRA-6386)
+ * Improve initial FD phi estimate when starting up (CASSANDRA-6385)
+ * Don't list CQL3 table in CLI describe even if named explicitely
+ (CASSANDRA-5750)
* Invalidate row cache when dropping CF (CASSANDRA-6351)
* add non-jamm path for cached statements (CASSANDRA-6293)
* (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f5526d54/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
[2/4] git commit: Randomize batchlog candidates selection
Posted by al...@apache.org.
Randomize batchlog candidates selection
patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6481
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f7f7598a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f7f7598a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f7f7598a
Branch: refs/heads/trunk
Commit: f7f7598a20e20ff3c4ee8e0e5b425680a480d9e0
Parents: 6ab82a4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Thu Dec 12 20:53:58 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Thu Dec 12 20:53:58 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageProxy.java | 3 +--
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f7598a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f5f23b..fa48a27 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,7 @@
(CASSANDRA-6413)
* (Hadoop) add describe_local_ring (CASSANDRA-6268)
* Fix handling of concurrent directory creation failure (CASSANDRA-6459)
+ * Randomize batchlog candidates selection (CASSANDRA-6481)
1.2.12
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f7f7598a/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index f195285..3e9f2cb 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -447,8 +447,7 @@ public class StorageProxy implements StorageProxyMBean
if (candidates.size() > 2)
{
- IEndpointSnitch snitch = DatabaseDescriptor.getEndpointSnitch();
- snitch.sortByProximity(FBUtilities.getBroadcastAddress(), candidates);
+ Collections.shuffle(candidates);
candidates = candidates.subList(0, 2);
}