diff options
| author | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2014-12-05 18:06:55 -0800 |
| commit | 091001ae8d27a8a5de03af2c20905e23a8ffefb7 (patch) | |
| tree | 28abfa5821f80e2090b8f89988a0bab004b710a5 /spec/support/shared/functional/http.rb | |
| parent | 8a7b450cb87ef62e9f21d32c91a52accefba6ffd (diff) | |
| parent | a45716b67a2168c21b166e4aab38668e9b96d856 (diff) | |
| download | chef-merging-master.tar.gz | |
Merge branch 'master' into merging-mastermerging-master
Conflicts:
lib/chef/version.rb
Diffstat (limited to 'spec/support/shared/functional/http.rb')
| -rw-r--r-- | spec/support/shared/functional/http.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/shared/functional/http.rb b/spec/support/shared/functional/http.rb index 9a3389306d..963fbf1c5b 100644 --- a/spec/support/shared/functional/http.rb +++ b/spec/support/shared/functional/http.rb @@ -131,7 +131,7 @@ module ChefHTTPShared } # - # in the presense of a transfer-encoding header, we must ignore the content-length (this bad content-length should work) + # in the presence of a transfer-encoding header, we must ignore the content-length (this bad content-length should work) # # (expected_content should be uncompressed) |