You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2015/08/17 20:44:55 UTC
incubator-brooklyn git commit: Fixed location of
external-ip-address-resolvers.txt file due to package change
Repository: incubator-brooklyn
Updated Branches:
refs/heads/master ff5ec4425 -> ff7f58041
Fixed location of external-ip-address-resolvers.txt file due to package change
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ff7f5804
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ff7f5804
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ff7f5804
Branch: refs/heads/master
Commit: ff7f580414392968223ae2b4728cdbf183fd3c4b
Parents: ff5ec44
Author: Andrew Kennedy <gr...@apache.org>
Authored: Sun Aug 16 17:14:57 2015 -0700
Committer: Andrew Kennedy <gr...@apache.org>
Committed: Mon Aug 17 11:44:40 2015 -0700
----------------------------------------------------------------------
.../apache/brooklyn/location/geo/LocalhostExternalIpLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ff7f5804/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java b/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java
index 1d31f0f..cd46bdd 100644
--- a/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java
+++ b/core/src/main/java/org/apache/brooklyn/location/geo/LocalhostExternalIpLoader.java
@@ -80,7 +80,7 @@ public class LocalhostExternalIpLoader {
@VisibleForTesting
static List<String> getIpAddressWebsites() {
String file = new ResourceUtils(LocalhostExternalIpLoader.class)
- .getResourceAsString("classpath://brooklyn/location/geo/external-ip-address-resolvers.txt");
+ .getResourceAsString("classpath://org/apache/brooklyn/location/geo/external-ip-address-resolvers.txt");
Iterable<String> lines = Splitter.on('\n')
.omitEmptyStrings()
.trimResults()