You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2014/12/20 22:40:18 UTC

[1/2] incubator-brooklyn git commit: Further fix to 25aaff9

Repository: incubator-brooklyn
Updated Branches:
  refs/heads/master 72cb9724c -> 674f54915


Further fix to 25aaff9

Accidentally introduced a different bug - this commit resolves it.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a20a0bc1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a20a0bc1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a20a0bc1

Branch: refs/heads/master
Commit: a20a0bc1e02f4b97aea7ef371bd10b2a6da5ff07
Parents: 25aaff9
Author: Richard Downer <ri...@apache.org>
Authored: Fri Dec 19 13:29:29 2014 +0000
Committer: Richard Downer <ri...@apache.org>
Committed: Fri Dec 19 13:29:29 2014 +0000

----------------------------------------------------------------------
 utils/common/src/main/java/brooklyn/util/net/Networking.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a20a0bc1/utils/common/src/main/java/brooklyn/util/net/Networking.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/Networking.java b/utils/common/src/main/java/brooklyn/util/net/Networking.java
index 77edb6f..2067283 100644
--- a/utils/common/src/main/java/brooklyn/util/net/Networking.java
+++ b/utils/common/src/main/java/brooklyn/util/net/Networking.java
@@ -83,7 +83,7 @@ public class Networking {
         // We substitute for the loopback address in those cases.
         InetAddress localAddressNotAny = (localAddress==null || ANY_NIC.equals(localAddress))
                 ? LOOPBACK
-                : ANY_NIC;
+                : localAddress;
 
         Stopwatch watch = Stopwatch.createStarted();
         try {

[2/2] incubator-brooklyn git commit: This closes #412

Posted by al...@apache.org.
This closes #412


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/674f5491
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/674f5491
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/674f5491

Branch: refs/heads/master
Commit: 674f549153c040806753d671efb1332c7f094fc4
Parents: 72cb972 a20a0bc
Author: Aled Sage <al...@gmail.com>
Authored: Sat Dec 20 21:39:41 2014 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Sat Dec 20 21:39:41 2014 +0000

----------------------------------------------------------------------
 utils/common/src/main/java/brooklyn/util/net/Networking.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------