You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/07/27 00:22:59 UTC
[1/4] cassandra git commit: Update build.xml and CHANGES.txt for 3.8
Repository: cassandra
Updated Branches:
refs/heads/trunk c4c9b0570 -> 6ca39ea42
Update build.xml and CHANGES.txt for 3.8
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3ded055
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3ded055
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3ded055
Branch: refs/heads/trunk
Commit: c3ded0551f538f7845602b27d53240cd8129265c
Parents: 2aa7663
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Jul 18 16:47:52 2016 +0100
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Jul 18 16:47:52 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 48 +++++++++++++++++++++---------------------------
build.xml | 2 +-
2 files changed, 22 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ded055/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 3307fb3..4330fde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,33 +1,7 @@
-3.9
+3.8
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
* Increase size of flushExecutor thread pool (CASSANDRA-12071)
-Merged from 3.0:
- * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
- * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
- * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)
- * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315)
- * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
- * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
- * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
- * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944)
- * Fix column ordering of results with static columns for Thrift requests in
- a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
- those static columns in query results (CASSANDRA-12123)
- * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
- * Fix EOF exception when altering column type (CASSANDRA-11820)
-Merged from 2.2:
- * Synchronize ThriftServer::stop() (CASSANDRA-12105)
- * Use dedicated thread for JMX notifications (CASSANDRA-12146)
- * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
- * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
-Merged from 2.1:
- * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
- * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
- * Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
-
-
-3.8
* Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
* Upgrade netty to 4.0.39 (CASSANDRA-12032, CASSANDRA-12034)
* Improve details in compaction log message (CASSANDRA-12080)
@@ -53,18 +27,38 @@ Merged from 2.1:
* Add repaired percentage metric (CASSANDRA-11503)
* Add Change-Data-Capture (CASSANDRA-8844)
Merged from 3.0:
+ * Fix paging logic for deleted partitions with static columns (CASSANDRA-12107)
+ * Wait until the message is being send to decide which serializer must be used (CASSANDRA-11393)
+ * Fix migration of static thrift column names with non-text comparators (CASSANDRA-12147)
+ * Fix upgrading sparse tables that are incorrectly marked as dense (CASSANDRA-11315)
+ * Fix reverse queries ignoring range tombstones (CASSANDRA-11733)
+ * Avoid potential race when rebuilding CFMetaData (CASSANDRA-12098)
+ * Avoid missing sstables when getting the canonical sstables (CASSANDRA-11996)
+ * Always select the live sstables when getting sstables in bounds (CASSANDRA-11944)
+ * Fix column ordering of results with static columns for Thrift requests in
+ a mixed 2.x/3.x cluster, also fix potential non-resolved duplication of
+ those static columns in query results (CASSANDRA-12123)
+ * Avoid digest mismatch with empty but static rows (CASSANDRA-12090)
+ * Fix EOF exception when altering column type (CASSANDRA-11820)
* cqlsh: fix error handling in rare COPY FROM failure scenario (CASSANDRA-12070)
* Disable autocompaction during drain (CASSANDRA-11878)
* Add a metrics timer to MemtablePool and use it to track time spent blocked on memory in MemtableAllocator (CASSANDRA-11327)
* Fix upgrading schema with super columns with non-text subcomparators (CASSANDRA-12023)
* Add TimeWindowCompactionStrategy (CASSANDRA-9666)
Merged from 2.2:
+ * Synchronize ThriftServer::stop() (CASSANDRA-12105)
+ * Use dedicated thread for JMX notifications (CASSANDRA-12146)
+ * Improve streaming synchronization and fault tolerance (CASSANDRA-11414)
+ * MemoryUtil.getShort() should return an unsigned short also for architectures not supporting unaligned memory accesses (CASSANDRA-11973)
* Allow nodetool info to run with readonly JMX access (CASSANDRA-11755)
* Validate bloom_filter_fp_chance against lowest supported
value when the table is created (CASSANDRA-11920)
* Don't send erroneous NEW_NODE notifications on restart (CASSANDRA-11038)
* StorageService shutdown hook should use a volatile variable (CASSANDRA-11984)
Merged from 2.1:
+ * Fix filtering on clustering columns when 2i is used (CASSANDRA-11907)
+ * Avoid stalling paxos when the paxos state expires (CASSANDRA-12043)
+ * Remove finished incoming streaming connections from MessagingService (CASSANDRA-11854)
* Don't try to get sstables for non-repairing column families (CASSANDRA-12077)
* Avoid marking too many sstables as repaired (CASSANDRA-11696)
* Prevent select statements with clustering key > 64k (CASSANDRA-11882)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3ded055/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e13fdc0..f16d917 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="3.9"/>
+ <property name="base.version" value="3.8"/>
<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"/>
[3/4] cassandra git commit: Merge branch 'cassandra-3.8' into
cassandra-3.9
Posted by db...@apache.org.
Merge branch 'cassandra-3.8' into cassandra-3.9
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/aa64e65e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa64e65e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aa64e65e
Branch: refs/heads/trunk
Commit: aa64e65e1e2f4a749454db578f60560b6d69ae0f
Parents: 5fe02b3 b27e2f9
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Jul 26 20:20:52 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Jul 26 20:20:52 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 -
src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa64e65e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 50f7a6d,4330fde..6bba5b1
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,21 -1,3 +1,20 @@@
+3.9
+ * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189)
+ * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109)
+Merged from 3.0:
+ * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980)
+ * Add option to override compaction space check (CASSANDRA-12180)
+ * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114)
+ * Respond with v1/v2 protocol header when responding to driver that attempts
+ to connect with too low of a protocol version (CASSANDRA-11464)
+ * NullPointerExpception when reading/compacting table (CASSANDRA-11988)
+ * Fix problem with undeleteable rows on upgrade to new sstable format (CASSANDRA-12144)
+Merged from 2.2:
+ * cqlsh copyutil should get host metadata by connected address (CASSANDRA-11979)
+ * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)
+Merged from 2.1:
+ * cannot use cql since upgrading python to 2.7.11+ (CASSANDRA-11850)
+
-
3.8
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
[2/4] cassandra git commit: c* uses commons-lang3, not commons-lang
Posted by db...@apache.org.
c* uses commons-lang3, not commons-lang
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b27e2f93
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b27e2f93
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b27e2f93
Branch: refs/heads/trunk
Commit: b27e2f93cc9bc33a95d531f43442b93e85ba4a30
Parents: c3ded05
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Mon Jul 4 17:23:46 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Jul 26 20:04:42 2016 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b27e2f93/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
index a914cc9..6acbd0d 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java
@@ -23,7 +23,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.zip.CRC32;
import com.google.common.annotations.VisibleForTesting;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
[4/4] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ca39ea4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ca39ea4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ca39ea4
Branch: refs/heads/trunk
Commit: 6ca39ea42471ce1f4a36d922c366a986dc4f1d34
Parents: c4c9b05 aa64e65
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Jul 26 20:22:07 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Jul 26 20:22:07 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6ca39ea4/CHANGES.txt
----------------------------------------------------------------------