summaryrefslogtreecommitdiff
path: root/lib/chef/application
diff options
context:
space:
mode:
authorRob Redpath <rob.redpath@wwwh.com>2014-11-12 11:26:18 +0000
committerLamont Granquist <lamont@scriptkiddie.org>2015-01-25 10:55:53 -0800
commit9831b13bf39df3eb0503dd0dbae908b97f1fbb4a (patch)
tree59cc9625fdb127d90a14024bcd2144dd3ce9d8ba /lib/chef/application
parente5b4162472dd3f11961363340a8cfb0ec8b9ac8e (diff)
downloadchef-9831b13bf39df3eb0503dd0dbae908b97f1fbb4a.tar.gz
Rephrase error
Diffstat (limited to 'lib/chef/application')
-rw-r--r--lib/chef/application/client.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index b6978b8a63..5db85ebe9c 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -415,7 +415,7 @@ class Chef::Application::Client < Chef::Application
end
def pidfile_lockfile_match_error_message
- "PID file and lockfile location match - this will cause conflicts"
+ "PID file and lockfile are not permitted to match"
end
def unforked_interval_error_message