diff options
author | Tim Smith <tsmith@chef.io> | 2018-07-17 16:30:10 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 16:30:10 -0700 |
commit | 282d50f1d01f0ebc09a6e79ea870e18240089dfc (patch) | |
tree | ad3e6a4f0c4912a9d668f84ca76df5d44af7ddf1 | |
parent | d4988971bd3577bd19c9ae0fff19d2eac873d787 (diff) | |
parent | 7b780581009f9ceee5bc1a9cd9ae5181c831ce02 (diff) | |
download | chef-282d50f1d01f0ebc09a6e79ea870e18240089dfc.tar.gz |
Merge pull request #7486 from chef/yard_fixes
@returns should be @return in yard
-rw-r--r-- | lib/chef/knife/bootstrap/chef_vault_handler.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/dnf.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/dnf/python_helper.rb | 2 | ||||
-rw-r--r-- | lib/chef/provider/package/yum.rb | 4 | ||||
-rw-r--r-- | lib/chef/provider/package/yum/python_helper.rb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/knife/bootstrap/chef_vault_handler.rb b/lib/chef/knife/bootstrap/chef_vault_handler.rb index 9990565856..24ed0eb379 100644 --- a/lib/chef/knife/bootstrap/chef_vault_handler.rb +++ b/lib/chef/knife/bootstrap/chef_vault_handler.rb @@ -131,7 +131,7 @@ class Chef # # @param vault [String] name of the chef-vault encrypted data bag # @param item [String] name of the chef-vault encrypted item - # @returns [ChefVault::Item] ChefVault::Item object + # @return [ChefVault::Item] ChefVault::Item object def load_chef_bootstrap_vault_item(vault, item) ChefVault::Item.load(vault, item) end diff --git a/lib/chef/provider/package/dnf.rb b/lib/chef/provider/package/dnf.rb index 2339b4cabe..76e9be8083 100644 --- a/lib/chef/provider/package/dnf.rb +++ b/lib/chef/provider/package/dnf.rb @@ -135,7 +135,7 @@ class Chef python_helper.compare_versions(v1, v2) end - # @returns Array<Version> + # @return Array<Version> def available_version(index) @available_version ||= [] diff --git a/lib/chef/provider/package/dnf/python_helper.rb b/lib/chef/provider/package/dnf/python_helper.rb index 5524740fc4..b3593f6efd 100644 --- a/lib/chef/provider/package/dnf/python_helper.rb +++ b/lib/chef/provider/package/dnf/python_helper.rb @@ -70,7 +70,7 @@ class Chef end end - # @returns Array<Version> + # @return Array<Version> def query(action, provides, version = nil, arch = nil) with_helper do json = build_query(action, provides, version, arch) diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb index 42dd11b43f..029d9dc2e0 100644 --- a/lib/chef/provider/package/yum.rb +++ b/lib/chef/provider/package/yum.rb @@ -220,7 +220,7 @@ class Chef end end - # @returns Array<Version> + # @return Array<Version> def available_version(index) @available_version ||= [] @@ -233,7 +233,7 @@ class Chef @available_version[index] end - # @returns Array<Version> + # @return Array<Version> def installed_version(index) @installed_version ||= [] @installed_version[index] ||= if new_resource.source diff --git a/lib/chef/provider/package/yum/python_helper.rb b/lib/chef/provider/package/yum/python_helper.rb index 0a09e12c3d..47caf46f57 100644 --- a/lib/chef/provider/package/yum/python_helper.rb +++ b/lib/chef/provider/package/yum/python_helper.rb @@ -106,7 +106,7 @@ class Chef end end - # @returns Array<Version> + # @return Array<Version> # NB: "options" here is the yum_package options hash and is deliberately not **opts def package_query(action, provides, version: nil, arch: nil, options: {}) parameters = { "provides" => provides, "version" => version, "arch" => arch } |