summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-10-28 12:34:11 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-10-28 12:34:11 -0700
commit543b8873037502f3b96a3e09b4069c58c813ffb8 (patch)
tree3aab5c9bc6008b0e1a8e62cebaf77305eba2d6d0 /CHANGELOG.md
parent6a306c0847d2738dcc3656318ebccff5888fe25c (diff)
downloadchef-543b8873037502f3b96a3e09b4069c58c813ffb8.tar.gz
add md files for chef_version/ohai_version merge
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00041ca584..1ef720b0fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@
* [**Patrick Connolly**](https://github.com/patcon)
[pr#3529](https://github.com/chef/chef/pull/3529) Allow user@hostname format for knife-bootstrap
+* [pr#4081](https://github.com/chef/chef/pull/4081) RFC-037: add `chef_version` and `ohai_version` metadata
* [pr#3530](https://github.com/chef/chef/pull/3530) Allow using --sudo option with user's home folder in knife bootstrap
* [pr#3858](https://github.com/chef/chef/pull/3858) Remove duplicate 'Accept' header in spec
* [pr#3911](https://github.com/chef/chef/pull/3911) Avoid subclassing Struct.new