You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2015/04/14 21:31:36 UTC
[01/10] cassandra git commit: Fix failed bootstrap/replace attempts
being persisted in system.peers
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 ac46747f8 -> a5bae1f5d
refs/heads/cassandra-2.1 cba1b68db -> f1115cfdf
refs/heads/trunk cb5897f3c -> 0df28d14a
Fix failed bootstrap/replace attempts being persisted in system.peers
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac46747f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac46747f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac46747f
Branch: refs/heads/cassandra-2.1
Commit: ac46747f84e62f6c9cbad0fb2e67a0eb95f43b01
Parents: def4835
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:19:53 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 14 12:19:53 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/StorageService.java | 43 +++++++++++---------
2 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac46747f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 772afd6..36d4b47 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.15:
+ * Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
(CASSANDRA-8102)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac46747f/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index cfd8fe1..e906f03 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1366,27 +1366,30 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return;
}
- switch (state)
+ if (getTokenMetadata().isMember(endpoint))
{
- case RELEASE_VERSION:
- SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(value.value));
- break;
- case DC:
- SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(value.value));
- break;
- case RACK:
- SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(value.value));
- break;
- case RPC_ADDRESS:
- SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
- break;
- case SCHEMA:
- SystemKeyspace.updatePeerInfo(endpoint, "schema_version", value.value);
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
- break;
- case HOST_ID:
- SystemKeyspace.updatePeerInfo(endpoint, "host_id", value.value);
- break;
+ switch (state)
+ {
+ case RELEASE_VERSION:
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(value.value));
+ break;
+ case DC:
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(value.value));
+ break;
+ case RACK:
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(value.value));
+ break;
+ case RPC_ADDRESS:
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
+ break;
+ case SCHEMA:
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", value.value);
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
+ break;
+ case HOST_ID:
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", value.value);
+ break;
+ }
}
}
}
[05/10] cassandra git commit: Fix running with
java.net.preferIPv6Addresses=true patch by Andrey Trubachev;
reviewed by Ariel Weisberg for CASSANDRA-9137
Posted by jb...@apache.org.
Fix running with java.net.preferIPv6Addresses=true
patch by Andrey Trubachev; reviewed by Ariel Weisberg for CASSANDRA-9137
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5bae1f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5bae1f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5bae1f5
Branch: refs/heads/trunk
Commit: a5bae1f5df764d7238cda7ab894d3c36d028f778
Parents: ac46747
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 14 12:39:39 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 12:43:30 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5bae1f5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 36d4b47..521668d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.15:
+ * Fix running with java.net.preferIPv6Addresses=true (CASSANDRA-9137)
* Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5bae1f5/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 039760e..737f4bf 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -160,7 +160,7 @@ public class CassandraDaemon
}
else
{
- System.setProperty("java.rmi.server.hostname","127.0.0.1");
+ System.setProperty("java.rmi.server.hostname", InetAddress.getLoopbackAddress().getHostAddress());
try
{
[10/10] cassandra git commit: merge from 2.1
Posted by jb...@apache.org.
merge from 2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0df28d14
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0df28d14
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0df28d14
Branch: refs/heads/trunk
Commit: 0df28d14a47de93a87b9546b21b04b32e93ef68c
Parents: cb5897f f1115cf
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 14 14:31:27 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 14:31:27 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0df28d14/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0df28d14/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
[04/10] cassandra git commit: Fix running with
java.net.preferIPv6Addresses=true patch by Andrey Trubachev;
reviewed by Ariel Weisberg for CASSANDRA-9137
Posted by jb...@apache.org.
Fix running with java.net.preferIPv6Addresses=true
patch by Andrey Trubachev; reviewed by Ariel Weisberg for CASSANDRA-9137
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5bae1f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5bae1f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5bae1f5
Branch: refs/heads/cassandra-2.1
Commit: a5bae1f5df764d7238cda7ab894d3c36d028f778
Parents: ac46747
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 14 12:39:39 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 12:43:30 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5bae1f5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 36d4b47..521668d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.15:
+ * Fix running with java.net.preferIPv6Addresses=true (CASSANDRA-9137)
* Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5bae1f5/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 039760e..737f4bf 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -160,7 +160,7 @@ public class CassandraDaemon
}
else
{
- System.setProperty("java.rmi.server.hostname","127.0.0.1");
+ System.setProperty("java.rmi.server.hostname", InetAddress.getLoopbackAddress().getHostAddress());
try
{
[03/10] cassandra git commit: Fix running with
java.net.preferIPv6Addresses=true patch by Andrey Trubachev;
reviewed by Ariel Weisberg for CASSANDRA-9137
Posted by jb...@apache.org.
Fix running with java.net.preferIPv6Addresses=true
patch by Andrey Trubachev; reviewed by Ariel Weisberg for CASSANDRA-9137
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a5bae1f5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a5bae1f5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a5bae1f5
Branch: refs/heads/cassandra-2.0
Commit: a5bae1f5df764d7238cda7ab894d3c36d028f778
Parents: ac46747
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 14 12:39:39 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 12:43:30 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5bae1f5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 36d4b47..521668d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.15:
+ * Fix running with java.net.preferIPv6Addresses=true (CASSANDRA-9137)
* Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a5bae1f5/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 039760e..737f4bf 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -160,7 +160,7 @@ public class CassandraDaemon
}
else
{
- System.setProperty("java.rmi.server.hostname","127.0.0.1");
+ System.setProperty("java.rmi.server.hostname", InetAddress.getLoopbackAddress().getHostAddress());
try
{
[07/10] cassandra git commit: Fix failed bootstrap/replace attempts
being persisted in system.peers
Posted by jb...@apache.org.
Fix failed bootstrap/replace attempts being persisted in system.peers
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee9bd549
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee9bd549
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee9bd549
Branch: refs/heads/trunk
Commit: ee9bd549e83a157ae727f2e38c921694fffda52d
Parents: cba1b68
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:19:53 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 12:50:01 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee9bd549/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index b527528..21d5249 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -88,7 +88,7 @@ public class CassandraDaemon
}
else
{
- System.setProperty("java.rmi.server.hostname","127.0.0.1");
+ System.setProperty("java.rmi.server.hostname", InetAddress.getLoopbackAddress().getHostAddress());
try
{
[02/10] cassandra git commit: Fix failed bootstrap/replace attempts
being persisted in system.peers
Posted by jb...@apache.org.
Fix failed bootstrap/replace attempts being persisted in system.peers
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac46747f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac46747f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac46747f
Branch: refs/heads/trunk
Commit: ac46747f84e62f6c9cbad0fb2e67a0eb95f43b01
Parents: def4835
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:19:53 2015 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 14 12:19:53 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/StorageService.java | 43 +++++++++++---------
2 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac46747f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 772afd6..36d4b47 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.0.15:
+ * Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
(CASSANDRA-8102)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac46747f/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index cfd8fe1..e906f03 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -1366,27 +1366,30 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return;
}
- switch (state)
+ if (getTokenMetadata().isMember(endpoint))
{
- case RELEASE_VERSION:
- SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(value.value));
- break;
- case DC:
- SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(value.value));
- break;
- case RACK:
- SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(value.value));
- break;
- case RPC_ADDRESS:
- SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
- break;
- case SCHEMA:
- SystemKeyspace.updatePeerInfo(endpoint, "schema_version", value.value);
- MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
- break;
- case HOST_ID:
- SystemKeyspace.updatePeerInfo(endpoint, "host_id", value.value);
- break;
+ switch (state)
+ {
+ case RELEASE_VERSION:
+ SystemKeyspace.updatePeerInfo(endpoint, "release_version", quote(value.value));
+ break;
+ case DC:
+ SystemKeyspace.updatePeerInfo(endpoint, "data_center", quote(value.value));
+ break;
+ case RACK:
+ SystemKeyspace.updatePeerInfo(endpoint, "rack", quote(value.value));
+ break;
+ case RPC_ADDRESS:
+ SystemKeyspace.updatePeerInfo(endpoint, "rpc_address", quote(value.value));
+ break;
+ case SCHEMA:
+ SystemKeyspace.updatePeerInfo(endpoint, "schema_version", value.value);
+ MigrationManager.instance.scheduleSchemaPull(endpoint, epState);
+ break;
+ case HOST_ID:
+ SystemKeyspace.updatePeerInfo(endpoint, "host_id", value.value);
+ break;
+ }
}
}
}
[06/10] cassandra git commit: Fix failed bootstrap/replace attempts
being persisted in system.peers
Posted by jb...@apache.org.
Fix failed bootstrap/replace attempts being persisted in system.peers
Patch by brandonwilliams, reviewed by slebresne for CASSANDRA-9180
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ee9bd549
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee9bd549
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ee9bd549
Branch: refs/heads/cassandra-2.1
Commit: ee9bd549e83a157ae727f2e38c921694fffda52d
Parents: cba1b68
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 14 12:19:53 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 12:50:01 2015 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ee9bd549/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index b527528..21d5249 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -88,7 +88,7 @@ public class CassandraDaemon
}
else
{
- System.setProperty("java.rmi.server.hostname","127.0.0.1");
+ System.setProperty("java.rmi.server.hostname", InetAddress.getLoopbackAddress().getHostAddress());
try
{
[08/10] cassandra git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1115cfd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1115cfd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1115cfd
Branch: refs/heads/cassandra-2.1
Commit: f1115cfdf01a2eff8cd4af9e49ce2e79a29f97de
Parents: ee9bd54 a5bae1f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 14 14:30:54 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 14:30:54 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1115cfd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dfd5649,521668d..c3e6c6c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,81 -1,5 +1,81 @@@
-2.0.15:
+2.1.5
+ * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
+ * Limit major sstable operations to their canonical representation (CASSANDRA-8669)
+ * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
+ * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
+ * Add generate-idea-files target to build.xml (CASSANDRA-9123)
+ * Do not load read meter for offline operations (CASSANDRA-9082)
+ * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
+ * cqlsh: Fix display of triggers (CASSANDRA-9081)
+ * Fix NullPointerException when deleting or setting an element by index on
+ a null list collection (CASSANDRA-9077)
+ * Buffer bloom filter serialization (CASSANDRA-9066)
+ * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
+ * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
+ * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
+ * Avoid overwriting index summaries for sstables with an older format that
+ does not support downsampling; rebuild summaries on startup when this
+ is detected (CASSANDRA-8993)
+ * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
+ * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085)
+ * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900)
+ * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
+ * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
+ * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
+ * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993)
+ * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746)
+ * SSTableScanner enforces its bounds (CASSANDRA-8946)
+ * Cleanup cell equality (CASSANDRA-8947)
+ * Introduce intra-cluster message coalescing (CASSANDRA-8692)
+ * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
+ * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
+ * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
+ * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
+ * Allow invalidating permissions and cache time (CASSANDRA-8722)
+ * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
+ are executed (CASSANDRA-8418)
+ * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948)
+ * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
+ * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769)
+ * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
+ * Use long for key count in cfstats (CASSANDRA-8913)
+ * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
+ * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
+ * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883)
+ * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
+ * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
+ * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366)
+ * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
+ * Fix parallelism adjustment in range and secondary index queries
+ when the first fetch does not satisfy the limit (CASSANDRA-8856)
+ * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
+ * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
+ * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
+ * Improve assertions in Memory (CASSANDRA-8792)
+ * Fix SSTableRewriter cleanup (CASSANDRA-8802)
+ * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
+ * 'nodetool info' prints exception against older node (CASSANDRA-8796)
+ * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750)
+ * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
+ * Enforce SSTableReader.first/last (CASSANDRA-8744)
+ * Cleanup SegmentedFile API (CASSANDRA-8749)
+ * Avoid overlap with early compaction replacement (CASSANDRA-8683)
+ * Safer Resource Management++ (CASSANDRA-8707)
+ * Write partition size estimates into a system table (CASSANDRA-7688)
+ * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
+ (CASSANDRA-8154)
+ * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
+ * IndexSummaryBuilder utilises offheap memory, and shares data between
+ each IndexSummary opened from it (CASSANDRA-8757)
+ * markCompacting only succeeds if the exact SSTableReader instances being
+ marked are in the live set (CASSANDRA-8689)
+ * cassandra-stress support for varint (CASSANDRA-8882)
+ * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
+ * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
+ * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
+ * Correctly identify 2i datadir from older versions (CASSANDRA-9116)
+Merged from 2.0:
- 2.0.15:
+ * Fix running with java.net.preferIPv6Addresses=true (CASSANDRA-9137)
* Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli
[09/10] cassandra git commit: merge from 2.0
Posted by jb...@apache.org.
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f1115cfd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1115cfd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1115cfd
Branch: refs/heads/trunk
Commit: f1115cfdf01a2eff8cd4af9e49ce2e79a29f97de
Parents: ee9bd54 a5bae1f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Apr 14 14:30:54 2015 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Apr 14 14:30:54 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1115cfd/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index dfd5649,521668d..c3e6c6c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,81 -1,5 +1,81 @@@
-2.0.15:
+2.1.5
+ * Allow takeColumnFamilySnapshot to take a list of tables (CASSANDRA-8348)
+ * Limit major sstable operations to their canonical representation (CASSANDRA-8669)
+ * cqlsh: Add tests for INSERT and UPDATE tab completion (CASSANDRA-9125)
+ * cqlsh: quote column names when needed in COPY FROM inserts (CASSANDRA-9080)
+ * Add generate-idea-files target to build.xml (CASSANDRA-9123)
+ * Do not load read meter for offline operations (CASSANDRA-9082)
+ * cqlsh: Make CompositeType data readable (CASSANDRA-8919)
+ * cqlsh: Fix display of triggers (CASSANDRA-9081)
+ * Fix NullPointerException when deleting or setting an element by index on
+ a null list collection (CASSANDRA-9077)
+ * Buffer bloom filter serialization (CASSANDRA-9066)
+ * Fix anti-compaction target bloom filter size (CASSANDRA-9060)
+ * Make FROZEN and TUPLE unreserved keywords in CQL (CASSANDRA-9047)
+ * Prevent AssertionError from SizeEstimatesRecorder (CASSANDRA-9034)
+ * Avoid overwriting index summaries for sstables with an older format that
+ does not support downsampling; rebuild summaries on startup when this
+ is detected (CASSANDRA-8993)
+ * Fix potential data loss in CompressedSequentialWriter (CASSANDRA-8949)
+ * Make PasswordAuthenticator number of hashing rounds configurable (CASSANDRA-8085)
+ * Fix AssertionError when binding nested collections in DELETE (CASSANDRA-8900)
+ * Check for overlap with non-early sstables in LCS (CASSANDRA-8739)
+ * Only calculate max purgable timestamp if we have to (CASSANDRA-8914)
+ * (cqlsh) Greatly improve performance of COPY FROM (CASSANDRA-8225)
+ * IndexSummary effectiveIndexInterval is now a guideline, not a rule (CASSANDRA-8993)
+ * Use correct bounds for page cache eviction of compressed files (CASSANDRA-8746)
+ * SSTableScanner enforces its bounds (CASSANDRA-8946)
+ * Cleanup cell equality (CASSANDRA-8947)
+ * Introduce intra-cluster message coalescing (CASSANDRA-8692)
+ * DatabaseDescriptor throws NPE when rpc_interface is used (CASSANDRA-8839)
+ * Don't check if an sstable is live for offline compactions (CASSANDRA-8841)
+ * Don't set clientMode in SSTableLoader (CASSANDRA-8238)
+ * Fix SSTableRewriter with disabled early open (CASSANDRA-8535)
+ * Allow invalidating permissions and cache time (CASSANDRA-8722)
+ * Log warning when queries that will require ALLOW FILTERING in Cassandra 3.0
+ are executed (CASSANDRA-8418)
+ * Fix cassandra-stress so it respects the CL passed in user mode (CASSANDRA-8948)
+ * Fix rare NPE in ColumnDefinition#hasIndexOption() (CASSANDRA-8786)
+ * cassandra-stress reports per-operation statistics, plus misc (CASSANDRA-8769)
+ * Add SimpleDate (cql date) and Time (cql time) types (CASSANDRA-7523)
+ * Use long for key count in cfstats (CASSANDRA-8913)
+ * Make SSTableRewriter.abort() more robust to failure (CASSANDRA-8832)
+ * Remove cold_reads_to_omit from STCS (CASSANDRA-8860)
+ * Make EstimatedHistogram#percentile() use ceil instead of floor (CASSANDRA-8883)
+ * Fix top partitions reporting wrong cardinality (CASSANDRA-8834)
+ * Fix rare NPE in KeyCacheSerializer (CASSANDRA-8067)
+ * Pick sstables for validation as late as possible inc repairs (CASSANDRA-8366)
+ * Fix commitlog getPendingTasks to not increment (CASSANDRA-8856)
+ * Fix parallelism adjustment in range and secondary index queries
+ when the first fetch does not satisfy the limit (CASSANDRA-8856)
+ * Check if the filtered sstables is non-empty in STCS (CASSANDRA-8843)
+ * Upgrade java-driver used for cassandra-stress (CASSANDRA-8842)
+ * Fix CommitLog.forceRecycleAllSegments() memory access error (CASSANDRA-8812)
+ * Improve assertions in Memory (CASSANDRA-8792)
+ * Fix SSTableRewriter cleanup (CASSANDRA-8802)
+ * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758)
+ * 'nodetool info' prints exception against older node (CASSANDRA-8796)
+ * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750)
+ * Make SSTableWriter.openEarly more robust and obvious (CASSANDRA-8747)
+ * Enforce SSTableReader.first/last (CASSANDRA-8744)
+ * Cleanup SegmentedFile API (CASSANDRA-8749)
+ * Avoid overlap with early compaction replacement (CASSANDRA-8683)
+ * Safer Resource Management++ (CASSANDRA-8707)
+ * Write partition size estimates into a system table (CASSANDRA-7688)
+ * cqlsh: Fix keys() and full() collection indexes in DESCRIBE output
+ (CASSANDRA-8154)
+ * Show progress of streaming in nodetool netstats (CASSANDRA-8886)
+ * IndexSummaryBuilder utilises offheap memory, and shares data between
+ each IndexSummary opened from it (CASSANDRA-8757)
+ * markCompacting only succeeds if the exact SSTableReader instances being
+ marked are in the live set (CASSANDRA-8689)
+ * cassandra-stress support for varint (CASSANDRA-8882)
+ * Fix Adler32 digest for compressed sstables (CASSANDRA-8778)
+ * Add nodetool statushandoff/statusbackup (CASSANDRA-8912)
+ * Use stdout for progress and stats in sstableloader (CASSANDRA-8982)
+ * Correctly identify 2i datadir from older versions (CASSANDRA-9116)
+Merged from 2.0:
- 2.0.15:
+ * Fix running with java.net.preferIPv6Addresses=true (CASSANDRA-9137)
* Fix failed bootstrap/replace attempts being persisted in system.peers (CASSANDRA-9180)
* Flush system.IndexInfo after marking index built (CASSANDRA-9128)
* Fix updates to min/max_compaction_threshold through cassandra-cli