add md files for PR #1561

3 files changed, 33 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 833dd0a055..072cacad34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased: 12.0.0
 
+* [**Yukihiko Sawanobori**](https://github.com/sawanoboly):
+  Add environment resource attribute to scm resources
 * added Chef::ResourceCollection#insert_at API to the ResourceCollection
 * [**Grzesiek Kolodziejczyk**](https://github.com/grk):
   Use thread-safe OpenSSL::Digest instead of Digest
diff --git a/DOC_CHANGES.md b/DOC_CHANGES.md
index ab1f5844a1..1a40d6730f 100644
--- a/DOC_CHANGES.md
+++ b/DOC_CHANGES.md
@@ -6,6 +6,21 @@ Example Doc Change:
 Description of the required change.
 -->
 
+### environment attribute to git provider
+
+Similar to other environment options:
+
+```
+environment     Hash of environment variables in the form of {"ENV_VARIABLE" => "VALUE"}.
+```
+
+Also the `user` attribute should mention the setting of the HOME env var:
+
+```
+user      The system user that is responsible for the checked-out code.  The HOME environment variable will automatically be
+set to the home directory of this user when using this option.
+```
+
 ### Metadata `name` Attribute is Required.
 
 Current documentation states:
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index c7567b8de2..c098445e48 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,5 +1,21 @@
 # Chef Client Release Notes 12.0.0:
 
+## Git SCM provider now support environment attribute
+
+You can now pass in a hash of environment variables into the git provider:
+
+```ruby
+git "/opt/mysources/couch" do
+  repository "git://git.apache.org/couchdb.git"
+  revision "master"
+  environment  { 'VAR' => 'whatever' }
+  action :sync
+end
+```
+
+The git provider already automatically sets `ENV['HOME']` and `ENV['GIT_SSH']` but those can both be overridden
+by passing them into the environment hash if the defaults are not appropriate.
+
 ## DSCL user provider now supports Mac OS X 10.7 and above.
 
 DSCL user provider in Chef has supported setting passwords only on Mac OS X 10.6. In this release, Mac OS X versions 10.7 and above are now supported. Support for Mac OS X 10.6 is dropped from the dscl provider since this version is EOLed by Apple.