summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Foy <jfoy@whitepages.com>2013-07-19 14:31:32 -0700
committerJack Foy <jfoy@whitepages.com>2013-07-19 14:31:32 -0700
commit6af839c98c5ff980a6a0a8b8e4ea3be321f56468 (patch)
tree72b0dc4a4a1fc498a391334b5bbf0431aa21c1c9
parent30d36c8c89f9957f65237ce65a0e421690df6fd3 (diff)
downloadchef-6af839c98c5ff980a6a0a8b8e4ea3be321f56468.tar.gz
Fix botched rebase
-rw-r--r--spec/unit/provider/git_spec.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/spec/unit/provider/git_spec.rb b/spec/unit/provider/git_spec.rb
index a0027a36ed..f10ea51f6d 100644
--- a/spec/unit/provider/git_spec.rb
+++ b/spec/unit/provider/git_spec.rb
@@ -173,9 +173,7 @@ SHAS
{
:user => deploy_user,
:environment => { "GIT_SSH" => wrapper },
- :log_level => :info,
:log_tag => "git[web2.0 app]",
- :live_stream => STDOUT,
}
end
before do