You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/09/26 20:33:15 UTC
[1/6] git commit: Fix wrong progress when streaming uncompressed
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 b1166c099 -> 3db38d7ed
refs/heads/cassandra-2.1 2a12e0574 -> ad60b7812
refs/heads/trunk 0485a31c0 -> a639379ba
Fix wrong progress when streaming uncompressed
patch by yukim; reviewed by Josh McKenzie for CASSANDRA-7878
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3db38d7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3db38d7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3db38d7e
Branch: refs/heads/cassandra-2.0
Commit: 3db38d7ed12960657cd5a79374c4ef28d6b9a966
Parents: b1166c0
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Sep 4 11:27:39 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 26 12:22:44 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamWriter.java | 22 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db38d7e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 00603f3..40e2f2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@
* Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
* Make repair no-op when RF=1 (CASSANDRA-7864)
* Fix NPE when table dropped during streaming (CASSANDRA-7946)
+ * Fix wrong progress when streaming uncompressed (CASSANDRA-7878)
Merged from 1.2:
* Don't index tombstones (CASSANDRA-7828)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db38d7e/src/java/org/apache/cassandra/streaming/StreamWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamWriter.java b/src/java/org/apache/cassandra/streaming/StreamWriter.java
index 5a5163f..43bc26a 100644
--- a/src/java/org/apache/cassandra/streaming/StreamWriter.java
+++ b/src/java/org/apache/cassandra/streaming/StreamWriter.java
@@ -87,7 +87,7 @@ public class StreamWriter
for (Pair<Long, Long> section : sections)
{
long start = validator == null ? section.left : validator.chunkStart(section.left);
- int skipBytes = (int) (section.left - start);
+ int readOffset = (int) (section.left - start);
// seek to the beginning of the section
file.seek(start);
if (validator != null)
@@ -96,14 +96,14 @@ public class StreamWriter
// length of the section to read
long length = section.right - start;
// tracks write progress
- long bytesTransferred = 0;
- while (bytesTransferred < length)
+ long bytesRead = 0;
+ while (bytesRead < length)
{
- long lastWrite = write(file, validator, skipBytes, length, bytesTransferred);
- bytesTransferred += lastWrite;
- progress += lastWrite;
+ long lastBytesRead = write(file, validator, readOffset, length, bytesRead);
+ bytesRead += lastBytesRead;
+ progress += (lastBytesRead - readOffset);
session.progress(sstable.descriptor, ProgressInfo.Direction.OUT, progress, totalSize);
- skipBytes = 0;
+ readOffset = 0;
}
// make sure that current section is send
@@ -132,10 +132,10 @@ public class StreamWriter
* @param reader The file reader to read from
* @param validator validator to verify data integrity
* @param start number of bytes to skip transfer, but include for validation.
- * @param length The full length that should be transferred
- * @param bytesTransferred Number of bytes remaining to transfer
+ * @param length The full length that should be read from {@code reader}
+ * @param bytesTransferred Number of bytes already read out of {@code length}
*
- * @return Number of bytes transferred
+ * @return Number of bytes read
*
* @throws java.io.IOException on any I/O error
*/
@@ -148,7 +148,7 @@ public class StreamWriter
if (validator != null)
validator.validate(transferBuffer, 0, minReadable);
- limiter.acquire(toTransfer);
+ limiter.acquire(toTransfer - start);
compressedOutput.write(transferBuffer, start, (toTransfer - start));
return toTransfer;
[3/6] git commit: Fix wrong progress when streaming uncompressed
Posted by yu...@apache.org.
Fix wrong progress when streaming uncompressed
patch by yukim; reviewed by Josh McKenzie for CASSANDRA-7878
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3db38d7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3db38d7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3db38d7e
Branch: refs/heads/trunk
Commit: 3db38d7ed12960657cd5a79374c4ef28d6b9a966
Parents: b1166c0
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Sep 4 11:27:39 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 26 12:22:44 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamWriter.java | 22 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db38d7e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 00603f3..40e2f2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@
* Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
* Make repair no-op when RF=1 (CASSANDRA-7864)
* Fix NPE when table dropped during streaming (CASSANDRA-7946)
+ * Fix wrong progress when streaming uncompressed (CASSANDRA-7878)
Merged from 1.2:
* Don't index tombstones (CASSANDRA-7828)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db38d7e/src/java/org/apache/cassandra/streaming/StreamWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamWriter.java b/src/java/org/apache/cassandra/streaming/StreamWriter.java
index 5a5163f..43bc26a 100644
--- a/src/java/org/apache/cassandra/streaming/StreamWriter.java
+++ b/src/java/org/apache/cassandra/streaming/StreamWriter.java
@@ -87,7 +87,7 @@ public class StreamWriter
for (Pair<Long, Long> section : sections)
{
long start = validator == null ? section.left : validator.chunkStart(section.left);
- int skipBytes = (int) (section.left - start);
+ int readOffset = (int) (section.left - start);
// seek to the beginning of the section
file.seek(start);
if (validator != null)
@@ -96,14 +96,14 @@ public class StreamWriter
// length of the section to read
long length = section.right - start;
// tracks write progress
- long bytesTransferred = 0;
- while (bytesTransferred < length)
+ long bytesRead = 0;
+ while (bytesRead < length)
{
- long lastWrite = write(file, validator, skipBytes, length, bytesTransferred);
- bytesTransferred += lastWrite;
- progress += lastWrite;
+ long lastBytesRead = write(file, validator, readOffset, length, bytesRead);
+ bytesRead += lastBytesRead;
+ progress += (lastBytesRead - readOffset);
session.progress(sstable.descriptor, ProgressInfo.Direction.OUT, progress, totalSize);
- skipBytes = 0;
+ readOffset = 0;
}
// make sure that current section is send
@@ -132,10 +132,10 @@ public class StreamWriter
* @param reader The file reader to read from
* @param validator validator to verify data integrity
* @param start number of bytes to skip transfer, but include for validation.
- * @param length The full length that should be transferred
- * @param bytesTransferred Number of bytes remaining to transfer
+ * @param length The full length that should be read from {@code reader}
+ * @param bytesTransferred Number of bytes already read out of {@code length}
*
- * @return Number of bytes transferred
+ * @return Number of bytes read
*
* @throws java.io.IOException on any I/O error
*/
@@ -148,7 +148,7 @@ public class StreamWriter
if (validator != null)
validator.validate(transferBuffer, 0, minReadable);
- limiter.acquire(toTransfer);
+ limiter.acquire(toTransfer - start);
compressedOutput.write(transferBuffer, start, (toTransfer - start));
return toTransfer;
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/ad60b781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad60b781
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad60b781
Branch: refs/heads/trunk
Commit: ad60b7812248ffc4ce2ef9648f41d0b442977e84
Parents: 2a12e05 3db38d7
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Sep 26 13:12:58 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 26 13:12:58 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamWriter.java | 22 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad60b781/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0080b25,40e2f2c..fca7ccb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -61,54 -12,9 +61,55 @@@ Merged from 2.0
* Fix RowIndexEntry to report correct serializedSize (CASSANDRA-7948)
* Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
* Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
- * Explicitly disallowing mixing multi-column and single-column
+ * Explicitly disallow mixing multi-column and single-column
relations on clustering columns (CASSANDRA-7711)
* Better error message when condition is set on PK column (CASSANDRA-7804)
+ * Don't send schema change responses and events for no-op DDL
+ statements (CASSANDRA-7600)
+ * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
+ * Throw InvalidRequestException when queries contain relations on entire
+ collection columns (CASSANDRA-7506)
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
+ * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
+ * (cqlsh) cqlsh should automatically disable tracing when selecting
+ from system_traces (CASSANDRA-7641)
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+ * Fix NPE when table dropped during streaming (CASSANDRA-7946)
++ * Fix wrong progress when streaming uncompressed (CASSANDRA-7878)
+Merged from 1.2:
+ * Don't index tombstones (CASSANDRA-7828)
+ * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
+
+
+2.1.0
+ * (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
+ (CASSANDRA-7895)
+ * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
+ * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
+ * Avoid exposing internal classes over JMX (CASSANDRA-7879)
+ * Add null check for keys when freezing collection (CASSANDRA-7869)
+ * Improve stress workload realism (CASSANDRA-7519)
+
+
+2.1.0-rc7
+ * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857)
+ * Track added sstable size correctly (CASSANDRA-7239)
+ * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
+ * Fix failure to stream ranges when moving (CASSANDRA-7836)
+ * Correctly remove tmplink files (CASSANDRA-7803)
+ * (cqlsh) Fix column name formatting for functions, CAS operations,
+ and UDT field selections (CASSANDRA-7806)
+ * (cqlsh) Fix COPY FROM handling of null/empty primary key
+ values (CASSANDRA-7792)
+ * Fix ordering of static cells (CASSANDRA-7763)
+Merged from 2.0:
* Forbid re-adding dropped counter columns (CASSANDRA-7831)
* Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
* Always reject inequality on the partition key without token()
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
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/ad60b781
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ad60b781
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ad60b781
Branch: refs/heads/cassandra-2.1
Commit: ad60b7812248ffc4ce2ef9648f41d0b442977e84
Parents: 2a12e05 3db38d7
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Sep 26 13:12:58 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 26 13:12:58 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamWriter.java | 22 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ad60b781/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0080b25,40e2f2c..fca7ccb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -61,54 -12,9 +61,55 @@@ Merged from 2.0
* Fix RowIndexEntry to report correct serializedSize (CASSANDRA-7948)
* Make CQLSSTableWriter sync within partitions (CASSANDRA-7360)
* Potentially use non-local replicas in CqlConfigHelper (CASSANDRA-7906)
- * Explicitly disallowing mixing multi-column and single-column
+ * Explicitly disallow mixing multi-column and single-column
relations on clustering columns (CASSANDRA-7711)
* Better error message when condition is set on PK column (CASSANDRA-7804)
+ * Don't send schema change responses and events for no-op DDL
+ statements (CASSANDRA-7600)
+ * (Hadoop) fix cluster initialisation for a split fetching (CASSANDRA-7774)
+ * Throw InvalidRequestException when queries contain relations on entire
+ collection columns (CASSANDRA-7506)
+ * (cqlsh) enable CTRL-R history search with libedit (CASSANDRA-7577)
+ * (Hadoop) allow ACFRW to limit nodes to local DC (CASSANDRA-7252)
+ * (cqlsh) cqlsh should automatically disable tracing when selecting
+ from system_traces (CASSANDRA-7641)
+ * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927)
+ * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508)
+ * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703)
+ * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229)
+ * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635)
+ * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611)
+ * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345)
+ * cqlsh fails when version number parts are not int (CASSANDRA-7524)
+ * Fix NPE when table dropped during streaming (CASSANDRA-7946)
++ * Fix wrong progress when streaming uncompressed (CASSANDRA-7878)
+Merged from 1.2:
+ * Don't index tombstones (CASSANDRA-7828)
+ * Improve PasswordAuthenticator default super user setup (CASSANDRA-7788)
+
+
+2.1.0
+ * (cqlsh) Removed "ALTER TYPE <name> RENAME TO <name>" from tab-completion
+ (CASSANDRA-7895)
+ * Fixed IllegalStateException in anticompaction (CASSANDRA-7892)
+ * cqlsh: DESCRIBE support for frozen UDTs, tuples (CASSANDRA-7863)
+ * Avoid exposing internal classes over JMX (CASSANDRA-7879)
+ * Add null check for keys when freezing collection (CASSANDRA-7869)
+ * Improve stress workload realism (CASSANDRA-7519)
+
+
+2.1.0-rc7
+ * Add frozen keyword and require UDT to be frozen (CASSANDRA-7857)
+ * Track added sstable size correctly (CASSANDRA-7239)
+ * (cqlsh) Fix case insensitivity (CASSANDRA-7834)
+ * Fix failure to stream ranges when moving (CASSANDRA-7836)
+ * Correctly remove tmplink files (CASSANDRA-7803)
+ * (cqlsh) Fix column name formatting for functions, CAS operations,
+ and UDT field selections (CASSANDRA-7806)
+ * (cqlsh) Fix COPY FROM handling of null/empty primary key
+ values (CASSANDRA-7792)
+ * Fix ordering of static cells (CASSANDRA-7763)
+Merged from 2.0:
* Forbid re-adding dropped counter columns (CASSANDRA-7831)
* Fix CFMetaData#isThriftCompatible() for PK-only tables (CASSANDRA-7832)
* Always reject inequality on the partition key without token()
[2/6] git commit: Fix wrong progress when streaming uncompressed
Posted by yu...@apache.org.
Fix wrong progress when streaming uncompressed
patch by yukim; reviewed by Josh McKenzie for CASSANDRA-7878
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3db38d7e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3db38d7e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3db38d7e
Branch: refs/heads/cassandra-2.1
Commit: 3db38d7ed12960657cd5a79374c4ef28d6b9a966
Parents: b1166c0
Author: Yuki Morishita <yu...@apache.org>
Authored: Thu Sep 4 11:27:39 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 26 12:22:44 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamWriter.java | 22 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db38d7e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 00603f3..40e2f2c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,7 @@
* Make disruptor_thrift_server invocation pool configurable (CASSANDRA-7594)
* Make repair no-op when RF=1 (CASSANDRA-7864)
* Fix NPE when table dropped during streaming (CASSANDRA-7946)
+ * Fix wrong progress when streaming uncompressed (CASSANDRA-7878)
Merged from 1.2:
* Don't index tombstones (CASSANDRA-7828)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3db38d7e/src/java/org/apache/cassandra/streaming/StreamWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamWriter.java b/src/java/org/apache/cassandra/streaming/StreamWriter.java
index 5a5163f..43bc26a 100644
--- a/src/java/org/apache/cassandra/streaming/StreamWriter.java
+++ b/src/java/org/apache/cassandra/streaming/StreamWriter.java
@@ -87,7 +87,7 @@ public class StreamWriter
for (Pair<Long, Long> section : sections)
{
long start = validator == null ? section.left : validator.chunkStart(section.left);
- int skipBytes = (int) (section.left - start);
+ int readOffset = (int) (section.left - start);
// seek to the beginning of the section
file.seek(start);
if (validator != null)
@@ -96,14 +96,14 @@ public class StreamWriter
// length of the section to read
long length = section.right - start;
// tracks write progress
- long bytesTransferred = 0;
- while (bytesTransferred < length)
+ long bytesRead = 0;
+ while (bytesRead < length)
{
- long lastWrite = write(file, validator, skipBytes, length, bytesTransferred);
- bytesTransferred += lastWrite;
- progress += lastWrite;
+ long lastBytesRead = write(file, validator, readOffset, length, bytesRead);
+ bytesRead += lastBytesRead;
+ progress += (lastBytesRead - readOffset);
session.progress(sstable.descriptor, ProgressInfo.Direction.OUT, progress, totalSize);
- skipBytes = 0;
+ readOffset = 0;
}
// make sure that current section is send
@@ -132,10 +132,10 @@ public class StreamWriter
* @param reader The file reader to read from
* @param validator validator to verify data integrity
* @param start number of bytes to skip transfer, but include for validation.
- * @param length The full length that should be transferred
- * @param bytesTransferred Number of bytes remaining to transfer
+ * @param length The full length that should be read from {@code reader}
+ * @param bytesTransferred Number of bytes already read out of {@code length}
*
- * @return Number of bytes transferred
+ * @return Number of bytes read
*
* @throws java.io.IOException on any I/O error
*/
@@ -148,7 +148,7 @@ public class StreamWriter
if (validator != null)
validator.validate(transferBuffer, 0, minReadable);
- limiter.acquire(toTransfer);
+ limiter.acquire(toTransfer - start);
compressedOutput.write(transferBuffer, start, (toTransfer - start));
return toTransfer;
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a639379b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a639379b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a639379b
Branch: refs/heads/trunk
Commit: a639379ba6becd380a92ae8dfb5bd2ac1597e3a3
Parents: 0485a31 ad60b78
Author: Yuki Morishita <yu...@apache.org>
Authored: Fri Sep 26 13:33:00 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Fri Sep 26 13:33:00 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/streaming/StreamWriter.java | 22 ++++++++++----------
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a639379b/CHANGES.txt
----------------------------------------------------------------------