Repository: cassandra Updated Branches: refs/heads/trunk 209d1dbd9 -> 0ce9abd78
remove dead local Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0ce9abd7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ce9abd7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0ce9abd7 Branch: refs/heads/trunk Commit: 0ce9abd78c8712ad4fba28734214b18f617a2aac Parents: 209d1db Author: Dave Brosius <[email protected]> Authored: Fri Aug 22 19:07:15 2014 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri Aug 22 19:07:15 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/YamlConfigurationLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0ce9abd7/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java index 174dd15..50991f2 100644 --- a/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java +++ b/src/java/org/apache/cassandra/config/YamlConfigurationLoader.java @@ -79,6 +79,7 @@ public class YamlConfigurationLoader implements ConfigurationLoader return url; } + @Override public Config loadConfig() throws ConfigurationException { return loadConfig(getStorageConfigURL()); @@ -86,7 +87,6 @@ public class YamlConfigurationLoader implements ConfigurationLoader public Config loadConfig(URL url) throws ConfigurationException { - InputStream input = null; try { logger.info("Loading settings from {}", url);
