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 2017/05/31 10:22:11 UTC
[1/2] brooklyn-server git commit: Fix for BROOKLYN-510
Repository: brooklyn-server
Updated Branches:
refs/heads/master a81471d15 -> d7b8b0cc0
Fix for BROOKLYN-510
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/968a69f6
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/968a69f6
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/968a69f6
Branch: refs/heads/master
Commit: 968a69f6ba4bef85b1f628be69ccf0898445ff9a
Parents: 947d5ae
Author: Duncan Godwin <du...@cloudsoftcorp.com>
Authored: Tue May 30 17:43:24 2017 +0100
Committer: Duncan Godwin <du...@cloudsoftcorp.com>
Committed: Tue May 30 17:43:24 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/968a69f6/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index e91b588..0c3a637 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -47,6 +47,7 @@ import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
import javax.xml.ws.WebServiceException;
+import com.google.common.primitives.Ints;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.api.location.MachineLocation;
@@ -936,8 +937,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
} else {
LOG.warn("Using DEPRECATED flag OPEN_IPTABLES (will not be supported in future versions) for {} at {}", machineLocation, this);
- @SuppressWarnings("unchecked")
- Iterable<Integer> inboundPorts = (Iterable<Integer>) setup.get(INBOUND_PORTS);
+ Iterable<Integer> inboundPorts = Ints.asList(template.getOptions().getInboundPorts());
if (inboundPorts == null || Iterables.isEmpty(inboundPorts)) {
LOG.info("No ports to open in iptables (no inbound ports) for {} at {}", machineLocation, this);
[2/2] brooklyn-server git commit: This closes #713
Posted by al...@apache.org.
This closes #713
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d7b8b0cc
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d7b8b0cc
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d7b8b0cc
Branch: refs/heads/master
Commit: d7b8b0cc050e1a8253c059b5bb574d230838d8b2
Parents: a81471d 968a69f
Author: Aled Sage <al...@gmail.com>
Authored: Wed May 31 11:21:58 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Wed May 31 11:21:58 2017 +0100
----------------------------------------------------------------------
.../org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------