diff --git a/History.md b/History.md index 510b4b9d..aa84ca29 100644 --- a/History.md +++ b/History.md @@ -8,6 +8,7 @@ * `GC.compact` is called before fork if available (#2093) * Add `requests_count` to workers stats. (#2106) * Changed #connected_port to #connected_ports (#2076) + * `--control` has been removed. Use `--control-url` (#1487) * Bugfixes * Windows update extconf.rb for use with ssp and varied Ruby/MSYS2 combinations (#2069) diff --git a/lib/puma/cli.rb b/lib/puma/cli.rb index cff30af8..2d387214 100644 --- a/lib/puma/cli.rb +++ b/lib/puma/cli.rb @@ -112,11 +112,6 @@ module Puma configure_control_url(arg) end - # alias --control-url for backwards-compatibility - o.on "--control URL", "DEPRECATED alias for --control-url" do |arg| - configure_control_url(arg) - end - o.on "--control-token TOKEN", "The token to use as authentication for the control server" do |arg| @control_options[:auth_token] = arg