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 2013/06/15 17:43:51 UTC
[1/2] git commit: retain initial cause exceptions for internode
encryption issues in MessagingService patch by hmetske reviewed by dbrosius
for CASSANDRA-5644
Updated Branches:
refs/heads/trunk d00423431 -> 66a5e09b0
retain initial cause exceptions for internode encryption issues in MessagingService
patch by hmetske reviewed by dbrosius for CASSANDRA-5644
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/082684dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/082684dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/082684dd
Branch: refs/heads/trunk
Commit: 082684dd806a0bf0964901e3749992e4b1a1d650
Parents: d87ed95
Author: Dave Brosius <db...@apache.org>
Authored: Sat Jun 15 11:41:24 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Jun 15 11:41:24 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
src/java/org/apache/cassandra/net/MessagingService.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/082684dd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a1fc8ce..9e68257 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -23,6 +23,8 @@
* Expose detailed read repair metrics (CASSANDRA-5618)
* Correct blob literal + ReversedType parsing (CASSANDRA-5629)
* Allow GPFS to prefer the internal IP like EC2MRS (CASSANDRA-5630)
+ * fix help text for -tspw cassandra-cli (CASSANDRA-5643)
+ * don't throw away initial causes exceptions for internode encryption issues (CASSANDRA-5644)
Merged from 1.1:
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Fix NPE in Pig's widerow mode (CASSANDRA-5488)
@@ -193,7 +195,7 @@ Merged from 1.1:
* GossipingPropertyFileSnitch loads saved dc/rack info if needed (CASSANDRA-5133)
* drain should flush system CFs too (CASSANDRA-4446)
* add inter_dc_tcp_nodelay setting (CASSANDRA-5148)
- * re-allow wrapping ranges for start_token/end_token range pairing (CASSANDRA-5106)
+ * re-allow wrapping ranges for start_token/end_token range pairitspwng (CASSANDRA-5106)
* fix validation compaction of empty rows (CASSADRA-5136)
* nodetool methods to enable/disable hint storage/delivery (CASSANDRA-4750)
* disallow bloom filter false positive chance of 0 (CASSANDRA-5013)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/082684dd/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index 824ac90..5e36f44 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -406,7 +406,7 @@ public final class MessagingService implements MessagingServiceMBean
}
catch (IOException e)
{
- throw new ConfigurationException("Unable to create ssl socket");
+ throw new ConfigurationException("Unable to create ssl socket", e);
}
// setReuseAddress happens in the factory.
logger.info("Starting Encrypted Messaging Service on SSL port {}", DatabaseDescriptor.getSSLStoragePort());
@@ -428,7 +428,7 @@ public final class MessagingService implements MessagingServiceMBean
}
catch (SocketException e)
{
- throw new ConfigurationException("Insufficient permissions to setReuseAddress");
+ throw new ConfigurationException("Insufficient permissions to setReuseAddress", e);
}
InetSocketAddress address = new InetSocketAddress(localEp, DatabaseDescriptor.getStoragePort());
try
[2/2] git commit: Merge branch 'cassandra-1.2' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66a5e09b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66a5e09b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66a5e09b
Branch: refs/heads/trunk
Commit: 66a5e09b0453dd9e1489f05c154a598e0bc3b66b
Parents: d004234 082684d
Author: Dave Brosius <db...@apache.org>
Authored: Sat Jun 15 11:43:10 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sat Jun 15 11:43:10 2013 -0400
----------------------------------------------------------------------
CHANGES.txt | 4 +++-
src/java/org/apache/cassandra/net/MessagingService.java | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a5e09b/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/66a5e09b/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------