diff options
| author | Bryan McLellan <btm@chef.io> | 2015-11-23 18:21:15 -0500 |
|---|---|---|
| committer | Bryan McLellan <btm@chef.io> | 2015-11-23 18:21:15 -0500 |
| commit | 244f7a5e6312dabc5b4d071beb476783a6d4e99d (patch) | |
| tree | 53f8598a51ffef2bee9dc65d3717836d72e5abd0 | |
| parent | 27c71ab080ba63b3ce83c44907bfd654a66b26d9 (diff) | |
| download | chef-244f7a5e6312dabc5b4d071beb476783a6d4e99d.tar.gz | |
CHANGELOG.md updates for #4160, #3848
Closes #4160
Closes #3848
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | DOC_CHANGES.md | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 24d01075df..63023acbe7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,10 @@ [pr#3633](https://github.com/chef/chef/pull/3633) add the word group to `converge_by` call for group provider * [**Patrick Connolly**](https://github.com/patcon) [pr#3529](https://github.com/chef/chef/pull/3529) Allow user@hostname format for knife-bootstrap +* [**Justin Seubert**](https://github.com/dude051) + [pr#4160](https://github.com/chef/chef/pull/4160) Correcting regex for upstart_state +* [**Jeff Blaine**](https://github.com/jblaine) + [pr#3848](https://github.com/chef/chef/pull/3848) Migrate to --ssh-identity-file instead of --identity-file * [pr#4185](https://github.com/chef/chef/pull/4185) dpkg provider cleanup * [pr#4165](https://github.com/chef/chef/pull/4165) Multipackage internal API improvements diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md index 381cb9b047..7ee2688c2c 100644 --- a/DOC_CHANGES.md +++ b/DOC_CHANGES.md @@ -63,3 +63,8 @@ Added reboot_action attribute to dsc_resource. If the DSC resource indicates that it requires a reboot, reboot_action can use the reboot resource to either reboot immediately (:reboot_now) or queue a reboot (:request_reboot). The default value of reboot_action is :nothing. + +### `knife bootstrap --ssh-identity-file` + +The --identity-file option to `knife bootstrap` has been deprecated in favor of `knife bootstrap --ssh-identity-file` +to better align with other ssh related options. |