Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Control CLI Bug Fix #1416

Merged
merged 2 commits into from Sep 22, 2017
Merged

Control CLI Bug Fix #1416

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9afd6f8
Patching control cli to user control-url instead of control
hiimtaylorjones Sep 20, 2017
89b6e66
Patching control cli to user control-url instead of control
hiimtaylorjones Sep 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/puma/control_cli.rb
View file
Open in desktop
Expand Up @@ -245,7 +245,7 @@ def start
run_args += ["-S", @state] if @state
run_args += ["-q"] if @quiet
run_args += ["--pidfile", @pidfile] if @pidfile
run_args += ["--control", @control_url] if @control_url
run_args += ["--control-url", @control_url] if @control_url
run_args += ["--control-token", @control_auth_token] if @control_auth_token
run_args += ["-C", @config_file] if @config_file

Expand Down