summaryrefslogtreecommitdiff
path: root/lib/chef/provider/service/upstart.rb
diff options
context:
space:
mode:
authortyler-ball <tyleraball@gmail.com>2014-11-25 11:23:57 -0800
committertyler-ball <tyleraball@gmail.com>2014-11-25 11:23:57 -0800
commite3a022e7a338d550fe59be04d689e4ecf13f8569 (patch)
tree47cb6e3098527d89c5c5db5ebec19ede6b534083 /lib/chef/provider/service/upstart.rb
parent868552dc9da2e122034ae7aa698dde5a9d9d5e0c (diff)
parent5c489b2fb6f10e5ba39d804524d754139e0b2dc9 (diff)
downloadchef-e3a022e7a338d550fe59be04d689e4ecf13f8569.tar.gz
Merge branch 'typofixes-vlajos-20141107' of github.com:vlajos/chef into tball/contrib-pass
Diffstat (limited to 'lib/chef/provider/service/upstart.rb')
-rw-r--r--lib/chef/provider/service/upstart.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/service/upstart.rb b/lib/chef/provider/service/upstart.rb
index 3a3ddb2385..8d4aa41035 100644
--- a/lib/chef/provider/service/upstart.rb
+++ b/lib/chef/provider/service/upstart.rb
@@ -41,7 +41,7 @@ class Chef
# In chef, when we ask a service to start, we expect it to have started before performing the next step
# since we have top down dependencies. Which is to say we may follow witha resource next that requires
# that service to be running. According to [2] we can trust that sending a 'goal' such as start will not
- # return until that 'goal' is reached, or some error has occured.
+ # return until that 'goal' is reached, or some error has occurred.
#
# [1] http://upstart.ubuntu.com/wiki/JobStates
# [2] http://www.netsplit.com/2008/04/27/upstart-05-events/