Skip to content

Commit 6eabcdf

Browse files
author
Julien Duchesne
committed
Fix merge error
1 parent 2ca0d2e commit 6eabcdf

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

src/main/java/hudson/plugins/ec2/SlaveTemplate.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,9 @@ private List<EC2AbstractSlave> provisionOndemand(int number, EnumSet<ProvisionOp
563563
if (!securityGroupSet.isEmpty()) {
564564
List<String> groupIds = getEc2SecurityGroups(ec2);
565565

566-
HashSet<Tag> instTags = getCustomInstanceTags(EC2Cloud.EC2_SLAVE_TYPE_DEMAND, diFilters);
566+
HashSet<Tag> instTags = getCustomInstanceTags(EC2Cloud.EC2_SLAVE_TYPE_DEMAND, diFilters);
567+
}
568+
}
567569

568570
if (getAssociatePublicIp()) {
569571
net.setAssociatePublicIpAddress(true);

0 commit comments

Comments
 (0)