You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2016/11/02 18:24:16 UTC
[1/3] cassandra git commit: Don't load mx4j beans twice
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.X ccac7efe9 -> d2d7299ee
refs/heads/trunk 8abb632c4 -> 8fcedf544
Don't load mx4j beans twice
patch by Eduard Tudenhoefner; reviewed by Robert Stupp for CASSANDRA-12869
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2d7299e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2d7299e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2d7299e
Branch: refs/heads/cassandra-3.X
Commit: d2d7299ee2442b762f5ee2814745e7b5720a41d6
Parents: ccac7ef
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Wed Nov 2 19:22:05 2016 +0100
Committer: Robert Stupp <sn...@snazy-ds15.local>
Committed: Wed Nov 2 19:22:05 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2d7299e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1b16518..25facd5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.10
+ * Don't load MX4J beans twice (CASSANDRA-12869)
* Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838)
* Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
* remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2d7299e/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 fcaa069..5a97dfe 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -411,8 +411,6 @@ public class CassandraDaemon
ScheduledExecutors.optionalTasks.schedule(viewRebuild, StorageService.RING_DELAY, TimeUnit.MILLISECONDS);
- Mx4jTool.maybeLoad();
-
if (!FBUtilities.getBroadcastAddress().equals(InetAddress.getLoopbackAddress()))
waitForGossipToSettle();
[3/3] cassandra git commit: Merge branch 'cassandra-3.X' into trunk
Posted by sn...@apache.org.
Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8fcedf54
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8fcedf54
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8fcedf54
Branch: refs/heads/trunk
Commit: 8fcedf544a7732341dc675804237814184910b14
Parents: 8abb632 d2d7299
Author: Robert Stupp <sn...@snazy-ds15.local>
Authored: Wed Nov 2 19:22:23 2016 +0100
Committer: Robert Stupp <sn...@snazy-ds15.local>
Committed: Wed Nov 2 19:22:23 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8fcedf54/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a1462a6,25facd5..176d34a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
+4.0
+ * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
+ * Add (automate) Nodetool Documentation (CASSANDRA-12672)
+ * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
+ * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
+ * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
+
+
3.10
+ * Don't load MX4J beans twice (CASSANDRA-12869)
* Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838)
* Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
* remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
[2/3] cassandra git commit: Don't load mx4j beans twice
Posted by sn...@apache.org.
Don't load mx4j beans twice
patch by Eduard Tudenhoefner; reviewed by Robert Stupp for CASSANDRA-12869
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2d7299e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2d7299e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2d7299e
Branch: refs/heads/trunk
Commit: d2d7299ee2442b762f5ee2814745e7b5720a41d6
Parents: ccac7ef
Author: Eduard Tudenhoefner <ed...@datastax.com>
Authored: Wed Nov 2 19:22:05 2016 +0100
Committer: Robert Stupp <sn...@snazy-ds15.local>
Committed: Wed Nov 2 19:22:05 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/CassandraDaemon.java | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2d7299e/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1b16518..25facd5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.10
+ * Don't load MX4J beans twice (CASSANDRA-12869)
* Extend native protocol request flags, add versions to SUPPORTED, and introduce ProtocolVersion enum (CASSANDRA-12838)
* Set JOINING mode when running pre-join tasks (CASSANDRA-12836)
* remove net.mintern.primitive library due to license issue (CASSANDRA-12845)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2d7299e/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 fcaa069..5a97dfe 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -411,8 +411,6 @@ public class CassandraDaemon
ScheduledExecutors.optionalTasks.schedule(viewRebuild, StorageService.RING_DELAY, TimeUnit.MILLISECONDS);
- Mx4jTool.maybeLoad();
-
if (!FBUtilities.getBroadcastAddress().equals(InetAddress.getLoopbackAddress()))
waitForGossipToSettle();