Merge remote-tracking branch 'jclouds/master'

arunsure · Feb 5, 2015 · c1b3e3e · c1b3e3e
2 parents 205bcbe + b00922e
commit c1b3e3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate.java b/jclouds-plugin/src/main/java/jenkins/plugins/jclouds/compute/JCloudsSlaveTemplate.java
@@ -240,9 +240,9 @@ public NodeMetadata get() {
             options.networks(csvToArray(networks));
         }
 
-        if (!Strings.isNullOrEmpty(securityGroups) && options instanceof NovaTemplateOptions) {
+        if (!Strings.isNullOrEmpty(securityGroups)) {
             LOGGER.info("Setting security groups to " + securityGroups);
-            options.as(NovaTemplateOptions.class).securityGroupNames(csvToArray(securityGroups));
+            options.securityGroups(csvToArray(securityGroups));
         }
 
         if (assignFloatingIp && options instanceof NovaTemplateOptions) {

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
         <test.jenkins.blobstore.build-version />
         <test.jenkins.blobstore.identity>FIXME_IDENTITY</test.jenkins.blobstore.identity>
         <test.jenkins.blobstore.credential>FIXME_CREDENTIALS</test.jenkins.blobstore.credential>
-        <jclouds.version>1.8.0</jclouds.version>
+        <jclouds.version>1.8.1</jclouds.version>
         <guava.version>18.0</guava.version>
         <jsch.version>0.1.48</jsch.version>
         <stapler.version>1.207</stapler.version>