diff options
author | username-is-already-taken2 <digitalgaz@hotmail.com> | 2018-11-22 11:00:42 +0000 |
---|---|---|
committer | username-is-already-taken2 <digitalgaz@hotmail.com> | 2018-11-23 07:36:57 +0000 |
commit | 25bdedeb788069666c8bf19b18dec14be6d8bf63 (patch) | |
tree | 8d5b99a413baf5e80aec17c4a70e4d9c3a9bee80 /lib/chef/resource/rhsm_subscription.rb | |
parent | 4422560c0f4f6c69775ba9c035f4ac86eb56b8db (diff) | |
parent | 5c436ac98fd9a5dd78e243616123650217c90419 (diff) | |
download | chef-25bdedeb788069666c8bf19b18dec14be6d8bf63.tar.gz |
Merge remote-tracking branch 'origin' into gb/windows_timezone
Signed-off-by: username-is-already-taken2 <digitalgaz@hotmail.com>
Diffstat (limited to 'lib/chef/resource/rhsm_subscription.rb')
-rw-r--r-- | lib/chef/resource/rhsm_subscription.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/resource/rhsm_subscription.rb b/lib/chef/resource/rhsm_subscription.rb index f00f801afa..52f4c41653 100644 --- a/lib/chef/resource/rhsm_subscription.rb +++ b/lib/chef/resource/rhsm_subscription.rb @@ -29,7 +29,7 @@ class Chef introduced "14.0" property :pool_id, String, - description: "An optional property for specifying the Pool ID if not using the resource's name.", + description: "An optional property for specifying the Pool ID if it differs from the resource block's name.", name_property: true action :attach do |