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 2014/05/06 06:16:28 UTC
[1/3] git commit: fix error msg loading rackdc properties when system
property is specified
Repository: cassandra
Updated Branches:
refs/heads/trunk 011f90e99 -> 8f5c90382
fix error msg loading rackdc properties when system property is specified
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/69e65be8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/69e65be8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/69e65be8
Branch: refs/heads/trunk
Commit: 69e65be8d77716c4ddf318d63f180aceb2393133
Parents: 4791d98
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 6 00:13:32 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 6 00:13:32 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/SnitchProperties.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/69e65be8/src/java/org/apache/cassandra/locator/SnitchProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 36fec7f..cb0946a 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -50,7 +50,7 @@ public class SnitchProperties
catch (Exception e)
{
// do not throw exception here, just consider this an incomplete or an empty property file.
- logger.warn("Unable to read " + RACKDC_PROPERTY_FILENAME);
+ logger.warn("Unable to read {}", ((configURL != null) ? configURL : RACKDC_PROPERTY_FILENAME));
}
finally
{
[2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f5c16c4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f5c16c4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f5c16c4
Branch: refs/heads/trunk
Commit: 8f5c16c499e51efd0d1f26480beb944ed1ed6c70
Parents: ac63e18 69e65be
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 6 00:15:37 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 6 00:15:37 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/SnitchProperties.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f5c16c4/src/java/org/apache/cassandra/locator/SnitchProperties.java
----------------------------------------------------------------------
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by db...@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/8f5c9038
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f5c9038
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f5c9038
Branch: refs/heads/trunk
Commit: 8f5c9038287ce4bb9d4c9872bbf568895b9f1070
Parents: 011f90e 8f5c16c
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue May 6 00:16:05 2014 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue May 6 00:16:05 2014 -0400
----------------------------------------------------------------------
src/java/org/apache/cassandra/locator/SnitchProperties.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------