summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kitchen-tests/cookbooks/end_to_end/recipes/windows.rb4
-rw-r--r--lib/chef/resource/hostname.rb6
2 files changed, 4 insertions, 6 deletions
diff --git a/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb b/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb
index 6e7ebf08a7..83cbe3da36 100644
--- a/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb
+++ b/kitchen-tests/cookbooks/end_to_end/recipes/windows.rb
@@ -5,10 +5,6 @@
# Copyright:: Copyright (c) Chef Software Inc.
#
-# hostnames on windows cannot contain a '.'
-# hostname on windows requires a reboot
-# hostname "chef-bk-ci"
-
chef_sleep "2"
execute "dir"
diff --git a/lib/chef/resource/hostname.rb b/lib/chef/resource/hostname.rb
index 017a5d37a8..a26fb98e4b 100644
--- a/lib/chef/resource/hostname.rb
+++ b/lib/chef/resource/hostname.rb
@@ -90,10 +90,12 @@ class Chef
default: true
property :domain_user, String,
- description: "The domain username with permissions to change the local hostname. Specified in the form of 'Domain\User'"
+ description: "The domain username with permissions to change the local hostname. Specified in the form of 'Domain\User'",
+ introduced: "17.1"
property :domain_password, String,
- description: "The password associated with the domain user account"
+ description: "The password associated with the domain user account",
+ introduced: "17.1"
action_class do
def append_replacing_matching_lines(path, regex, string)