You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by ad...@apache.org on 2012/08/09 22:09:50 UTC

svn commit: r1371425 - in /whirr/trunk: CHANGES.txt core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java

Author: adriancole
Date: Thu Aug  9 20:09:49 2012
New Revision: 1371425

URL: http://svn.apache.org/viewvc?rev=1371425&view=rev
Log:
WHIRR-611: Cloud providers may only return "public" IPs

Modified:
    whirr/trunk/CHANGES.txt
    whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java

Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1371425&r1=1371424&r2=1371425&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Thu Aug  9 20:09:49 2012
@@ -153,6 +153,12 @@ Trunk (unreleased changes)
 
     WHIRR-602. Cloud providers may only return "private" IPs (Andrew Bayer via asavu)
 
+    WHIRR-611. Cloud providers may only return "public" IPs. (adriancole)
+
+    WHIRR-609. Yum install of openjdk needs -y (Andrew Bayer via adriancole)
+
+    WHIRR-613. OpenJDK JAVA_HOME detection needs to be improved (Andrew Bayer via adriancole)
+
 Release 0.7.1 - 2012-02-23
 
   IMPROVEMENTS
@@ -882,9 +888,3 @@ Release 0.1.0 - 2010-09-02
 
     WHIRR-86. Update quick start documentation to work with release 0.1.0.
     (tomwhite)
-
-    WHIRR-611. Cloud providers may only return "public" IPs. (adriancole)
-
-    WHIRR-609. Yum install of openjdk needs -y (Andrew Bayer via adriancole)
-
-    WHIRR-613. OpenJDK JAVA_HOME detection needs to be improved (Andrew Bayer via adriancole)

Modified: whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java?rev=1371425&r1=1371424&r2=1371425&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java (original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/actions/BootstrapClusterAction.java Thu Aug  9 20:09:49 2012
@@ -141,7 +141,7 @@ public class BootstrapClusterAction exte
       public Instance apply(NodeMetadata node) {
         return new Instance(node.getCredentials(), roles,
                             Iterables.get(node.getPublicAddresses().size() > 0 ? node.getPublicAddresses() : node.getPrivateAddresses(), 0),
-            Iterables.get(node.getPrivateAddresses(), 0),
+                            Iterables.get(node.getPrivateAddresses().size() > 0 ? node.getPrivateAddresses() : node.getPublicAddresses(), 0),
             node.getId(), node);
       }
     }));