diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:49:54 -0700 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2010-08-27 12:50:26 -0700 |
| commit | 21afb51a1b84116b2a906a6959ae588f45135104 (patch) | |
| tree | 48fa0438d0a50202194956344d0cf1f10b17b818 /ext/rack/files | |
| parent | 1f3070c4bc77b38e3dd6170cf6a58bee7ec337ac (diff) | |
| parent | 8be1929043f4560bb17a4b06293b3f9a4efcfdbf (diff) | |
| download | puppet-21afb51a1b84116b2a906a6959ae588f45135104.tar.gz puppet-21afb51a1b84116b2a906a6959ae588f45135104.tar.xz puppet-21afb51a1b84116b2a906a6959ae588f45135104.zip | |
Merge commit '2.6.1rc3'
This synchronizes the 2.7 master branch with 2.6.1RC3
The 2.7 next branch has now diverged from master for the first time, as
if contains code that has not reached "release quality" status.
Diffstat (limited to 'ext/rack/files')
| -rw-r--r-- | ext/rack/files/config.ru | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/rack/files/config.ru b/ext/rack/files/config.ru index 995a9f8c5..f9c492dd7 100644 --- a/ext/rack/files/config.ru +++ b/ext/rack/files/config.ru @@ -4,8 +4,7 @@ # if puppet is not in your RUBYLIB: # $:.unshift('/opt/puppet/lib') -$0 = "puppetmasterd" -require 'puppet' +$0 = "master" # if you want debugging: # ARGV << "--debug" |