natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-2.0' into cassandra-2.1

This commit is contained in:
Dave Brosius 2014-05-06 00:15:37 -04:00
parent ac63e180a5 69e65be8d7
commit 8f5c16c499
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/org/apache/cassandra/locator/SnitchProperties.java
View File

@ -50,8 +50,8 @@ public class SnitchProperties
}
catch (Exception e)
{
// do not throw exception here, just consider this a incomplete or a empty property file.
logger.warn("Unable to read {}", RACKDC_PROPERTY_FILENAME);
// do not throw exception here, just consider this an incomplete or an empty property file.
logger.warn("Unable to read {}", ((configURL != null) ? configURL : RACKDC_PROPERTY_FILENAME));
}
finally
{