Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
cthiessen committed May 11, 2020
2 parents 1afa610 + 60800f1 commit fb16d48
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion doc/resource_types.md
Original file line number Diff line number Diff line change
Expand Up @@ -1620,7 +1620,7 @@ describe emr('my-emr') do
end
```

### its(:id), its(:name), its(:instance_collection_type), its(:log_uri), its(:requested_ami_version), its(:running_ami_version), its(:release_label), its(:auto_terminate), its(:termination_protected), its(:visible_to_all_users), its(:service_role), its(:normalized_instance_hours), its(:master_public_dns_name), its(:configurations), its(:security_configuration), its(:auto_scaling_role), its(:scale_down_behavior), its(:custom_ami_id), its(:ebs_root_volume_size), its(:repo_upgrade_on_boot), its(:cluster_arn), its(:step_concurrency_level), its(:outpost_arn)
### its(:id), its(:name), its(:instance_collection_type), its(:log_uri), its(:requested_ami_version), its(:running_ami_version), its(:release_label), its(:auto_terminate), its(:termination_protected), its(:visible_to_all_users), its(:service_role), its(:normalized_instance_hours), its(:master_public_dns_name), its(:configurations), its(:security_configuration), its(:auto_scaling_role), its(:scale_down_behavior), its(:custom_ami_id), its(:ebs_root_volume_size), its(:repo_upgrade_on_boot), its(:cluster_arn), its(:outpost_arn), its(:step_concurrency_level)
## <a name="firehose">firehose</a>

Firehose resource type.
Expand Down
4 changes: 2 additions & 2 deletions lib/awspec/helper/finder/acm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module Finder
module Acm
def find_certificate(id)
selected = []
req = {}
loop do
req = {}
res = acm_client.list_certificates(req)
selected += res.certificate_summary_list.select do |c|
c.certificate_arn == id || c.domain_name == id
Expand All @@ -19,8 +19,8 @@ def find_certificate(id)

def select_all_certificates
certs = []
req = {}
loop do
req = {}
res = acm_client.list_certificates(req)
res.certificate_summary_list.each do |c|
certs << c.certificate_arn
Expand Down
2 changes: 1 addition & 1 deletion lib/awspec/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Awspec
VERSION = '1.18.4'
VERSION = '1.18.6'
end

0 comments on commit fb16d48

Please sign in to comment.