You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/07/10 23:24:19 UTC
[1/4] git commit: Versions update for 1.2.18
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0 1a9d4b89d -> 380583b5e
Versions update for 1.2.18
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a658be5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a658be5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a658be5
Branch: refs/heads/cassandra-2.1.0
Commit: 5a658be5ed3339b7dc52084d7eb33dd8295fa9f3
Parents: 04250f2
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Wed Jul 2 11:41:06 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Wed Jul 2 11:41:06 2014 +0200
----------------------------------------------------------------------
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/5a658be5/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index 97d32f2..d2d1fa5 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,6 +13,15 @@ restore snapshots created with the previous major version using the
'sstableloader' tool. You can upgrade the file format of your snapshots
using the provided 'sstableupgrade' tool.
+1.2.18
+======
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 1.2.17 if you are upgrading
+ from a previous version.
+
+
1.2.17
======
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a658be5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1310d64..94d3e2d 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.17"/>
+ <property name="base.version" value="1.2.18"/>
<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/5a658be5/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index adb7a37..e80e45e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.18) unstable; urgency=medium
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Wed, 02 Jul 2014 10:55:12 +0200
+
cassandra (1.2.17) unstable; urgency=medium
* New release
[2/4] git commit: Set stream ID on response for non-Exception
Throwables
Posted by ty...@apache.org.
Set stream ID on response for non-Exception Throwables
Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7470
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d90b03a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d90b03a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d90b03a
Branch: refs/heads/cassandra-2.1.0
Commit: 0d90b03a30247ae8a1cf2977467de1972b36f9dd
Parents: 5a658be
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 10 16:11:20 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 10 16:11:20 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/transport/Message.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d90b03a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1a79e8d..2951fed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.2.19
+ * Set correct stream ID on responses when non-Exception Throwables
+ are thrown while handling native protocol messages (CASSANDRA-7470)
+
1.2.18
* Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445)
* Fix compilation with java 6 broke by CASSANDRA-7147
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d90b03a/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index 5cc3998..74aaad1 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -293,7 +293,7 @@ public abstract class Message
ctx.getChannel().write(response);
}
- catch (Exception ex)
+ catch (Throwable ex)
{
// Don't let the exception propagate to exceptionCaught() if we can help it so that we can assign the right streamID.
ctx.getChannel().write(ErrorMessage.fromException(ex).setStreamId(request.getStreamId()));
[3/4] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by ty...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Conflicts:
CHANGES.txt
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/233308f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/233308f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/233308f0
Branch: refs/heads/cassandra-2.1.0
Commit: 233308f0245ebffdb6b9c77560c1914d3f2a1572
Parents: 11351e3 0d90b03
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 10 16:17:39 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 10 16:17:39 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 ++
src/java/org/apache/cassandra/transport/Message.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/233308f0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6b4e44b,2951fed..d39cf63
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,49 -1,12 +1,51 @@@
-1.2.19
+2.0.10
+ * Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
+ * Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
+ * Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
+ operations to incorrect become full QUORUM (CASSANDRA-7345)
+ * Properly handle unrecognized opcodes and flags (CASSANDRA-7440)
+ * (Hadoop) close CqlRecordWriter clients when finished (CASSANDRA-7459)
+ * Make sure high level sstables get compacted (CASSANDRA-7414)
+ * Fix AssertionError when using empty clustering columns and static columns
+ (CASSANDRA-7455)
+ * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
+ * Add option to disable STCS in L0 (CASSANDRA-6621)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
+Merged from 1.2:
+ * Set correct stream ID on responses when non-Exception Throwables
+ are thrown while handling native protocol messages (CASSANDRA-7470)
-1.2.18
- * Support Thrift tables clustering columns on CqlPagingInputFormat (CASSANDRA-7445)
- * Fix compilation with java 6 broke by CASSANDRA-7147
-1.2.17
+2.0.9
+ * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
+ * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
+ * Fix native protocol CAS batches (CASSANDRA-7337)
+ * 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)
+ * Account for range tombstones in min/max column names (CASSANDRA-7235)
+ * Improve sub range repair validation (CASSANDRA-7317)
+ * Accept subtypes for function results, type casts (CASSANDRA-6766)
+ * Support DISTINCT for static columns and fix behaviour when DISTINC is
+ not use (CASSANDRA-7305).
+ * Refuse range queries with strict bounds on compact tables since they
+ are broken (CASSANDRA-7059)
+Merged from 1.2:
+ * Expose global ColumnFamily metrics (CASSANDRA-7273)
* cqlsh: Fix CompositeType columns in DESCRIBE TABLE output (CASSANDRA-7399)
* Expose global ColumnFamily metrics (CASSANDRA-7273)
* Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/233308f0/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
[4/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Posted by ty...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/380583b5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/380583b5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/380583b5
Branch: refs/heads/cassandra-2.1.0
Commit: 380583b5e5aec1bf269185e1fdf1f31c632ccef4
Parents: 1a9d4b8 233308f
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Thu Jul 10 16:24:03 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Thu Jul 10 16:24:03 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/380583b5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5132976,d39cf63..c0fd4c0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,28 -1,5 +1,31 @@@
-2.0.10
+2.1.0-final
+ * (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
+Merged from 2.0:
* Warn when SSL certificates have expired (CASSANDRA-7528)
+ * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
++Merged from 1.2:
++ * Set correct stream ID on responses when non-Exception Throwables
++ are thrown while handling native protocol messages (CASSANDRA-7470)
+
+
+2.1.0-rc3
+ * Consider expiry when reconciling otherwise equal cells (CASSANDRA-7403)
+ * Introduce CQL support for stress tool (CASSANDRA-6146)
+ * Fix ClassCastException processing expired messages (CASSANDRA-7496)
+ * Fix prepared marker for collections inside UDT (CASSANDRA-7472)
+ * Remove left-over populate_io_cache_on_flush and replicate_on_write
+ uses (CASSANDRA-7493)
+ * (Windows) handle spaces in path names (CASSANDRA-7451)
+ * Ensure writes have completed after dropping a table, before recycling
+ commit log segments (CASSANDRA-7437)
+ * Remove left-over rows_per_partition_to_cache (CASSANDRA-7493)
+ * Fix error when CONTAINS is used with a bind marker (CASSANDRA-7502)
+ * Properly reject unknown UDT field (CASSANDRA-7484)
+Merged from 2.0:
+ * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
+ * Support DISTINCT for static columns and fix behaviour when DISTINC is
+ not use (CASSANDRA-7305).
* Workaround JVM NPE on JMX bind failure (CASSANDRA-7254)
* Fix race in FileCacheService RemovalListener (CASSANDRA-7278)
* Fix inconsistent use of consistencyForCommit that allowed LOCAL_QUORUM
@@@ -33,38 -9,34 +36,39 @@@
* Make sure high level sstables get compacted (CASSANDRA-7414)
* Fix AssertionError when using empty clustering columns and static columns
(CASSANDRA-7455)
- * Add inter_dc_stream_throughput_outbound_megabits_per_sec (CASSANDRA-6596)
* Add option to disable STCS in L0 (CASSANDRA-6621)
- * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
-Merged from 1.2:
- * Set correct stream ID on responses when non-Exception Throwables
- are thrown while handling native protocol messages (CASSANDRA-7470)
+ * Upgrade to snappy-java 1.0.5.2 (CASSANDRA-7476)
-2.0.9
- * Fix CC#collectTimeOrderedData() tombstone optimisations (CASSANDRA-7394)
- * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
+2.1.0-rc2
+ * Fix heap size calculation for CompoundSparseCellName and
+ CompoundSparseCellName.WithCollection (CASSANDRA-7421)
+ * Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
+ * Modify reconcile logic to always pick a tombstone over a counter cell
+ (CASSANDRA-7346)
+ * Avoid incremental compaction on Windows (CASSANDRA-7365)
+ * 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)
+ * Handle empty CFs in Memtable#maybeUpdateLiveRatio() (CASSANDRA-7401)
* 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, 7353)
+ * RefCount native frames from netty (CASSANDRA-7245)
+ * Use tarball dir instead of /var for default paths (CASSANDRA-7136)
+ * Remove rows_per_partition_to_cache keyword (CASSANDRA-7193)
+ * Fix schema change response in native protocol v3 (CASSANDRA-7413)
+Merged from 2.0:
+ * Fix assertion error in CL.ANY timeout handling (CASSANDRA-7364)
* 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)
* Account for range tombstones in min/max column names (CASSANDRA-7235)
* Improve sub range repair validation (CASSANDRA-7317)
* Accept subtypes for function results, type casts (CASSANDRA-6766)