brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rich...@apache.org
Subject [2/4] git commit: Change from @andreaturli for Docker port forwarding
Date Wed, 28 May 2014 10:05:15 GMT
Change from @andreaturli for Docker port forwarding


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

Branch: refs/heads/master
Commit: 8f347b0f4ecb4703fd952d603f57405cbf08a097
Parents: 4e1301b
Author: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Authored: Wed May 28 10:55:13 2014 +0100
Committer: Andrew Kennedy <andrew.kennedy@cloudsoftcorp.com>
Committed: Wed May 28 10:55:13 2014 +0100

----------------------------------------------------------------------
 .../src/main/java/brooklyn/location/jclouds/JcloudsLocation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/8f347b0f/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
index e4c3fce..e0c172c 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
@@ -644,7 +644,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
 
             if ("docker".equals(this.getProvider())) {
                 Map<Integer, Integer> portMappings = getPortMappingsForDocker(sshMachineLocation);
-                PortForwardManager portForwardManager = getConfig(PORT_FORWARDING_MANAGER);
+                PortForwardManager portForwardManager = setup.get(PORT_FORWARDING_MANAGER);
                 if (portForwardManager != null) {
                     for(Integer containerPort : portMappings.keySet()) {
                         Integer hostPort = portMappings.get(containerPort);


Mime
View raw message