puma 3.0.0.rc1 → 5.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ec0eeb5886074470b19df49db748d9fad55c57c6
-  data.tar.gz: 74521d8b05a10a149cf6aa0fb4dc4c7e199ab124
+SHA256:
+  metadata.gz: d624c4973e123e4b085bd0080a85d76c996f26743dde5d8e55ca4f3971e6d77a
+  data.tar.gz: 8f3ebe99584b845456708a73ae5305b012058c09af0a5e75bead0322c1c8501c
 SHA512:
-  metadata.gz: d64e58108913abf1b2252ba3038553ec28c82cfe96aa8812de7bdc58215881aea90a1048b490cee8699df99c73f3ea2b9d1dd3b472d082fbcc7974003c79e16c
-  data.tar.gz: 35befe3e0a9d01fa14f58841ecbcef2fa84a99ba8b3c564ceacb99101e52d50a855c7ab65c983caf816a09bf5547fb35b4e6f111985bea1cb5940e46a01b4dc8
+  metadata.gz: 1dbaeeb104fa56b185b1b647fc865a3b25eb621dba523dba15d056bef66137279fbb57545330ab3f486e610a88ed487f3ccf2e6f0b9c75de12522dc9db9b0029
+  data.tar.gz: 1b2f86bb5275f3764b891da8c3bc3643e1544d7209385aae8d87b5aa572945ceb627ef70df23060bc27abc9714b16377b8fa371b3ac3a10738e76cbd69f88841

data/{History.txt → History.md}

@@ -1,4 +1,628 @@
-=== 2.16.0 / 2016-01-27
+## 5.0.0
+
+* Features
+  * EXPERIMENTAL: Add `fork_worker` option and `refork` command for reduced memory usage by forking from a worker process instead of the master process. (#2099)
+  * EXPERIMENTAL: Added `wait_for_less_busy_worker` config. This may reduce latency on MRI through inserting a small delay before re-listening on the socket if worker is busy (#2079).
+  * EXPERIMENTAL: Added `nakayoshi_fork` option. Reduce memory usage in preloaded cluster-mode apps by GCing before fork and compacting, where available. (#2093, #2256)
+  * Added pumactl `thread-backtraces` command to print thread backtraces (#2054)
+  * Added incrementing `requests_count` to `Puma.stats`. (#2106)
+  * Increased maximum URI path length from 2048 to 8196 bytes (#2167)
+  * `lowlevel_error_handler` is now called during a forced threadpool shutdown, and if a callable with 3 arguments is set, we now also pass the status code (#2203)
+  * Faster phased restart and worker timeout (#2220)
+  * Added `state_permission` to config DSL to set state file permissions (#2238)
+  * Added `Puma.stats_hash`, which returns a stats in Hash instead of a JSON string (#2086, #2253)
+
+* Deprecations, Removals and Breaking API Changes
+  * `--control` has been removed. Use `--control-url` (#1487)
+  * `worker_directory` has been removed. Use `directory`.
+  * min_threads now set by environment variables PUMA_MIN_THREADS and MIN_THREADS. (#2143)
+  * max_threads now set by environment variables PUMA_MAX_THREADS and MAX_THREADS. (#2143)
+  * max_threads default to 5 in MRI or 16 for all other interpreters. (#2143)
+  * preload by default if workers > 1 (#2143)
+  * Puma::Plugin.workers_supported? has been removed. Use Puma.forkable? instead. (#2143)
+  * `tcp_mode` has been removed without replacement. (#2169)
+  * Daemonization has been removed without replacement. (#2170)
+  * Changed #connected_port to #connected_ports (#2076)
+  * Configuration: `environment` is read from `RAILS_ENV`, if `RACK_ENV` can't be found (#2022)
+
+* Bugfixes
+  * Do not set user_config to quiet by default to allow for file config (#2074)
+  * Always close SSL connection in Puma::ControlCLI (#2211)
+  * Windows update extconf.rb for use with ssp and varied Ruby/MSYS2 combinations (#2069)
+  * Ensure control server Unix socket is closed on shutdown (#2112)
+  * Preserve `BUNDLE_GEMFILE` env var when using `prune_bundler` (#1893)
+  * Send 408 request timeout even when queue requests is disabled (#2119)
+  * Rescue IO::WaitReadable instead of EAGAIN for blocking read (#2121)
+  * Ensure `BUNDLE_GEMFILE` is unspecified in workers if unspecified in master when using `prune_bundler` (#2154)
+  * Rescue and log exceptions in hooks defined by users (on_worker_boot, after_worker_fork etc) (#1551)
+  * Read directly from the socket in #read_and_drop to avoid raising further SSL errors (#2198)
+  * Set `Connection: closed` header when queue requests is disabled (#2216)
+  * Pass queued requests to thread pool on server shutdown (#2122)
+  * Fixed a few minor concurrency bugs in ThreadPool that may have affected non-GVL Rubies (#2220)
+  * Fix `out_of_band` hook never executed if the number of worker threads is > 1 (#2177)
+  * Fix ThreadPool#shutdown timeout accuracy (#2221)
+  * Fix `UserFileDefaultOptions#fetch` to properly use `default` (#2233)
+  * Improvements to `out_of_band` hook (#2234)
+  * Prefer the rackup file specified by the CLI (#2225)
+
+* Refactor
+  * Remove unused loader argument from Plugin initializer (#2095)
+  * Simplify `Configuration.random_token` and remove insecure fallback (#2102)
+  * Simplify `Runner#start_control` URL parsing (#2111)
+  * Removed the IOBuffer extension and replaced with Ruby (#1980)
+  * Update `Rack::Handler::Puma.run` to use `**options` (#2189)
+  * ThreadPool concurrency refactoring (#2220)
+  * JSON parse cluster worker stats instead of regex (#2124)
+  * Support parallel tests in verbose progress reporting (#2223)
+
+## 4.3.3 and 3.12.4 / 2020-02-28
+
+* Bugfixes
+  * Fix: Fixes a problem where we weren't splitting headers correctly on newlines (#2132)
+* Security
+  * Fix: Prevent HTTP Response splitting via CR in early hints. CVE-2020-5249.
+
+## 4.3.2 and 3.12.3 / 2020-02-27 (YANKED)
+
+* Security
+  * Fix: Prevent HTTP Response splitting via CR/LF in header values. CVE-2020-5247.
+
+## 4.3.1 and 3.12.2 / 2019-12-05
+
+* Security
+  * Fix: a poorly-behaved client could use keepalive requests to monopolize Puma's reactor and create a denial of service attack. CVE-2019-16770.
+
+## 4.3.0 / 2019-11-07
+
+* Features
+  * Strip whitespace at end of HTTP headers (#2010)
+  * Optimize HTTP parser for JRuby (#2012)
+  * Add SSL support for the control app and cli (#2046, #2052)
+
+* Bugfixes
+  * Fix Errno::EINVAL when SSL is enabled and browser rejects cert (#1564)
+  * Fix pumactl defaulting puma to development if an environment was not specified (#2035)
+  * Fix closing file stream when reading pid from pidfile (#2048)
+  * Fix a typo in configuration option `--extra_runtime_dependencies` (#2050)
+
+## 4.2.1 / 2019-10-07
+
+* 3 bugfixes
+  * Fix socket activation of systemd (pre-existing) unix binder files (#1842, #1988)
+  * Deal with multiple calls to bind correctly (#1986, #1994, #2006)
+  * Accepts symbols for `verify_mode` (#1222)
+
+## 4.2.0 / 2019-09-23
+
+* 6 features
+  * Pumactl has a new -e environment option and reads `config/puma/<environment>.rb` config files (#1885)
+  * Semicolons are now allowed in URL paths (MRI only), useful for Angular or Redmine (#1934)
+  * Allow extra dependencies to be defined when using prune_bundler (#1105)
+  * Puma now reports the correct port when binding to port 0, also reports other listeners when binding to localhost (#1786)
+  * Sending SIGINFO to any Puma worker now prints currently active threads and their backtraces (#1320)
+  * Puma threads all now have their name set on Ruby 2.3+ (#1968)
+* 4 bugfixes
+  * Fix some misbehavior with phased restart and externally SIGTERMed workers (#1908, #1952)
+  * Fix socket closing on error (#1941)
+  * Removed unnecessary SIGINT trap for JRuby that caused some race conditions (#1961)
+  * Fix socket files being left around after process stopped (#1970)
+* Absolutely thousands of lines of test improvements and fixes thanks to @MSP-Greg
+
+## 4.1.1 / 2019-09-05
+
+* 3 bugfixes
+  * Revert our attempt to not dup STDOUT/STDERR (#1946)
+  * Fix socket close on error (#1941)
+  * Fix workers not shutting down correctly (#1908)
+
+## 4.1.0 / 2019-08-08
+
+* 4 features
+  * Add REQUEST_PATH on parse error message (#1831)
+  * You can now easily add custom log formatters with the `log_formatter` config option (#1816)
+  * Puma.stats now provides process start times (#1844)
+  * Add support for disabling TLSv1.1 (#1836)
+
+* 7 bugfixes
+  * Fix issue where Puma was creating zombie process entries (#1887)
+  * Fix bugs with line-endings and chunked encoding (#1812)
+  * RACK_URL_SCHEME is now set correctly in all conditions (#1491)
+  * We no longer mutate global STDOUT/STDERR, particularly the sync setting (#1837)
+  * SSL read_nonblock no longer blocks (#1857)
+  * Swallow connection errors when sending early hints (#1822)
+  * Backtrace no longer dumped when invalid pumactl commands are run (#1863)
+
+* 5 other
+  * Avoid casting worker_timeout twice (#1838)
+  * Removed a call to private that wasn't doing anything (#1882)
+  * README, Rakefile, docs and test cleanups (#1848, #1847, #1846, #1853, #1859, #1850, #1866, #1870, #1872, #1833, #1888)
+  * Puma.io has proper documentation now (https://puma.io/puma/)
+  * Added the Contributor Covenant CoC
+
+* 1 known issue
+  * Some users are still experiencing issues surrounding socket activation and Unix sockets (#1842)
+
+## 4.0.1 / 2019-07-11
+
+* 2 bugfixes
+  * Fix socket removed after reload - should fix problems with systemd socket activation. (#1829)
+  * Add extconf tests for DTLS_method & TLS_server_method, use in minissl.rb. Should fix "undefined symbol: DTLS_method" when compiling against old OpenSSL versions. (#1832)
+* 1 other
+  * Removed unnecessary RUBY_VERSION checks. (#1827)
+
+## 4.0.0 / 2019-06-25
+
+* 9 features
+  * Add support for disabling TLSv1.0 (#1562)
+  * Request body read time metric (#1569)
+  * Add out_of_band hook (#1648)
+  * Re-implement (native) IOBuffer for JRuby (#1691)
+  * Min worker timeout (#1716)
+  * Add option to suppress SignalException on SIGTERM (#1690)
+  * Allow mutual TLS CA to be set using `ssl_bind` DSL (#1689)
+  * Reactor now uses nio4r instead of `select` (#1728)
+  * Add status to pumactl with pidfile (#1824)
+
+* 10 bugfixes
+  * Do not accept new requests on shutdown (#1685, #1808)
+  * Fix 3 corner cases when request body is chunked (#1508)
+  * Change pid existence check's condition branches (#1650)
+  * Don't call .stop on a server that doesn't exist (#1655)
+  * Implemented NID_X9_62_prime256v1 (P-256) curve over P-521 (#1671)
+  * Fix @notify.close can't modify frozen IOError (RuntimeError) (#1583)
+  * Fix Java 8 support (#1773)
+  * Fix error `uninitialized constant Puma::Cluster` (#1731)
+  * Fix `not_token` being able to be set to true (#1803)
+  * Fix "Hang on SIGTERM with ruby 2.6 in clustered mode" ([PR #1741], [#1674], [#1720], [#1730], [#1755])
+
+[PR #1741]: https://github.com/puma/puma/pull/1741
+[#1674]: https://github.com/puma/puma/issues/1674
+[#1720]: https://github.com/puma/puma/issues/1720
+[#1730]: https://github.com/puma/puma/issues/1730
+[#1755]: https://github.com/puma/puma/issues/1755
+
+## 3.12.1 / 2019-03-19
+
+* 1 features
+  * Internal strings are frozen (#1649)
+* 3 bugfixes
+  * Fix chunked ending check (#1607)
+  * Rack handler should use provided default host (#1700)
+  * Better support for detecting runtimes that support `fork` (#1630)
+
+## 3.12.0 / 2018-07-13
+
+* 5 features:
+  * You can now specify which SSL ciphers the server should support, default is unchanged (#1478)
+  * The setting for Puma's `max_threads` is now in `Puma.stats` (#1604)
+  * Pool capacity is now in `Puma.stats` (#1579)
+  * Installs restricted to Ruby 2.2+ (#1506)
+  * `--control` is now deprecated in favor of `--control-url` (#1487)
+
+* 2 bugfixes:
+  * Workers will no longer accept more web requests than they have capacity to process. This prevents an issue where one worker would accept lots of requests while starving other workers (#1563)
+  * In a test env puma now emits the stack on an exception (#1557)
+
+## 3.11.4 / 2018-04-12
+
+* 2 features:
+  * Manage puma as a service using rc.d (#1529)
+  * Server stats are now available from a top level method (#1532)
+* 5 bugfixes:
+  * Fix parsing CLI options (#1482)
+  * Order of stderr and stdout is made before redirecting to a log file (#1511)
+  * Init.d fix of `ps -p` to check if pid exists (#1545)
+  * Early hints bugfix (#1550)
+  * Purge interrupt queue when closing socket fails (#1553)
+
+## 3.11.3 / 2018-03-05
+
+* 3 bugfixes:
+  * Add closed? to MiniSSL::Socket for use in reactor (#1510)
+  * Handle EOFError at the toplevel of the server threads (#1524) (#1507)
+  * Deal with zero sized bodies when using SSL (#1483)
+
+## 3.11.2 / 2018-01-19
+
+* 1 bugfix:
+  * Deal with read\_nonblock returning nil early
+
+## 3.11.1 / 2018-01-18
+
+* 1 bugfix:
+  * Handle read\_nonblock returning nil when the socket close (#1502)
+
+## 3.11.0 / 2017-11-20
+
+* 2 features:
+  * HTTP 103 Early Hints (#1403)
+  * 421/451 status codes now have correct status messages attached (#1435)
+
+* 9 bugfixes:
+  * Environment config files (/config/puma/<ENV>.rb) load correctly (#1340)
+  * Specify windows dependencies correctly (#1434, #1436)
+  * puma/events required in test helper (#1418)
+  * Correct control CLI's option help text (#1416)
+  * Remove a warning for unused variable in mini_ssl (#1409)
+  * Correct pumactl docs argument ordering (#1427)
+  * Fix an uninitialized variable warning in server.rb (#1430)
+  * Fix docs typo/error in Launcher init (#1429)
+  * Deal with leading spaces in RUBYOPT (#1455)
+
+* 2 other:
+  * Add docs about internals (#1425, #1452)
+  * Tons of test fixes from @MSP-Greg (#1439, #1442, #1464)
+
+## 3.10.0 / 2017-08-17
+
+* 3 features:
+  * The status server has a new /gc and /gc-status command. (#1384)
+  * The persistent and first data timeouts are now configurable (#1111)
+  * Implemented RFC 2324 (#1392)
+
+* 12 bugfixes:
+  * Not really a Puma bug, but @NickolasVashchenko created a gem to workaround a Ruby bug that some users of Puma may be experiencing. See README for more. (#1347)
+  * Fix hangups with SSL and persistent connections. (#1334)
+  * Fix Rails double-binding to a port (#1383)
+  * Fix incorrect thread names (#1368)
+  * Fix issues with /etc/hosts and JRuby where localhost addresses were not correct. (#1318)
+  * Fix compatibility with RUBYOPT="--enable-frozen-string-literal" (#1376)
+  * Fixed some compiler warnings (#1388)
+  * We actually run the integration tests in CI now (#1390)
+  * No longer shipping unnecessary directories in the gemfile (#1391)
+  * If RUBYOPT is nil, we no longer blow up on restart. (#1385)
+  * Correct response to SIGINT (#1377)
+  * Proper exit code returned when we receive a TERM signal (#1337)
+
+* 3 refactors:
+  * Various test improvements from @grosser
+  * Rubocop (#1325)
+  * Hoe has been removed (#1395)
+
+* 1 known issue:
+  * Socket activation doesn't work in JRuby. Their fault, not ours. (#1367)
+
+## 3.9.1 / 2017-06-03
+
+* 2 bugfixes:
+  * Fixed compatibility with older Bundler versions (#1314)
+  * Some internal test/development cleanup (#1311, #1313)
+
+## 3.9.0 / 2017-06-01
+
+* 2 features:
+  * The ENV is now reset to its original values when Puma restarts via USR1/USR2 (#1260) (MRI only, no JRuby support)
+  * Puma will no longer accept more clients than the maximum number of threads. (#1278)
+
+* 9 bugfixes:
+  * Reduce information leakage by preventing HTTP parse errors from writing environment hashes to STDERR (#1306)
+  * Fix SSL/WebSocket compatibility (#1274)
+  * HTTP headers with empty values are no longer omitted from responses. (#1261)
+  * Fix a Rack env key which was set to nil. (#1259)
+  * peercert has been implemented for JRuby (#1248)
+  * Fix port settings when using rails s (#1277, #1290)
+  * Fix compat w/LibreSSL (#1285)
+  * Fix restarting Puma w/symlinks and a new Gemfile (#1282)
+  * Replace Dir.exists? with Dir.exist? (#1294)
+
+* 1 known issue:
+  * A bug in MRI 2.2+ can result in IOError: stream closed. See #1206. This issue has existed since at least Puma 3.6, and probably further back.
+
+* 1 refactor:
+  * Lots of test fixups from @grosser.
+
+## 3.8.2 / 2017-03-14
+
+* 1 bugfix:
+  * Deal with getsockopt with TCP\_INFO failing for sockets that say they're TCP but aren't really. (#1241)
+
+## 3.8.1 / 2017-03-10
+
+* 1 bugfix:
+  * Remove method call to method that no longer exists (#1239)
+
+## 3.8.0 / 2017-03-09
+
+* 2 bugfixes:
+  * Port from rack handler does not take precedence over config file in Rails 5.1.0.beta2+ and 5.0.1.rc3+ (#1234)
+  * The `tmp/restart.txt` plugin no longer restricts the user from running more than one server from the same folder at a time (#1226)
+
+* 1 feature:
+  * Closed clients are aborted to save capacity (#1227)
+
+* 1 refactor:
+  * Bundler is no longer a dependency from tests (#1213)
+
+## 3.7.1 / 2017-02-20
+
+* 2 bugfixes:
+  * Fix typo which blew up MiniSSL (#1182)
+  * Stop overriding command-line options with the config file (#1203)
+
+## 3.7.0 / 2017-01-04
+
+* 6 minor features:
+  * Allow rack handler to accept ssl host. (#1129)
+  * Refactor TTOU processing. TTOU now handles multiple signals at once. (#1165)
+  * Pickup any remaining chunk data as the next request.
+  * Prevent short term thread churn - increased auto trim default to 30 seconds.
+  * Raise error when `stdout` or `stderr` is not writable. (#1175)
+  * Add Rack 2.0 support to gemspec. (#1068)
+
+* 5 refactors:
+  * Compare host and server name only once per call. (#1091)
+  * Minor refactor on Thread pool (#1088)
+  * Removed a ton of unused constants, variables and files.
+  * Use MRI macros when allocating heap memory
+  * Use hooks for on\_booted event. (#1160)
+
+* 14 bugfixes:
+  * Add eof? method to NullIO? (#1169)
+  * Fix Puma startup in provided init.d script (#1061)
+  * Fix default SSL mode back to none. (#1036)
+  * Fixed the issue of @listeners getting nil io (#1120)
+  * Make `get_dh1024` compatible with OpenSSL v1.1.0 (#1178)
+  * More gracefully deal with SSL sessions. Fixes #1002
+  * Move puma.rb to just autoloads. Fixes #1063
+  * MiniSSL: Provide write as <<. Fixes #1089
+  * Prune bundler should inherit fds (#1114)
+  * Replace use of Process.getpgid which does not behave as intended on all platforms (#1110)
+  * Transfer encoding header should be downcased before comparison (#1135)
+  * Use same write log logic for hijacked requests. (#1081)
+  * Fix `uninitialized constant Puma::StateFile` (#1138)
+  * Fix access priorities of each level in LeveledOptions (#1118)
+
+* 3 others:
+
+  * Lots of tests added/fixed/improved. Switched to Minitest from Test::Unit. Big thanks to @frodsan.
+  * Lots of documentation added/improved.
+  * Add license indicators to the HTTP extension. (#1075)
+
+## 3.6.2 / 2016-11-22
+
+* 1 bug fix:
+
+  * Revert #1118/Fix access priorities of each level in LeveledOptions. This
+    had an unintentional side effect of changing the importance of command line
+    options, such as -p.
+
+## 3.6.1 / 2016-11-21
+
+* 8 bug fixes:
+
+  * Fix Puma start in init.d script.
+  * Fix default SSL mode back to none. Fixes #1036
+  * Fixed the issue of @listeners getting nil io, fix rails restart (#1120)
+  * More gracefully deal with SSL sessions. Fixes #1002
+  * Prevent short term thread churn.
+  * Provide write as <<. Fixes #1089
+  * Fix access priorities of each level in LeveledOptions - fixes TTIN.
+  * Stub description files updated for init.d.
+
+* 2 new project committers:
+
+  * Nate Berkopec (@nateberkopec)
+  * Richard Schneeman (@schneems)
+
+## 3.6.0 / 2016-07-24
+
+* 12 bug fixes:
+  * Add ability to detect a shutting down server. Fixes #932
+  * Add support for Expect: 100-continue. Fixes #519
+  * Check SSLContext better. Fixes #828
+  * Clarify behavior of '-t num'. Fixes #984
+  * Don't default to VERIFY_PEER. Fixes #1028
+  * Don't use ENV['PWD'] on windows. Fixes #1023
+  * Enlarge the scope of catching app exceptions. Fixes #1027
+  * Execute background hooks after daemonizing. Fixes #925
+  * Handle HUP as a stop unless there is IO redirection. Fixes #911
+  * Implement chunked request handling. Fixes #620
+  * Just rescue exception to return a 500. Fixes #1027
+  * Redirect IO in the jruby daemon mode. Fixes #778
+
+## 3.5.2 / 2016-07-20
+
+* 1 bug fix:
+  * Don't let persistent_timeout be nil
+
+* 1 PR merged:
+  * Merge pull request #1021 from benzrf/patch-1
+
+## 3.5.1 / 2016-07-20
+
+* 1 bug fix:
+  * Be sure to only listen on host:port combos once. Fixes #1022
+
+## 3.5.0 / 2016-07-18
+
+* 1 minor features:
+  * Allow persistent_timeout to be configured via the dsl.
+
+* 9 bug fixes:
+  * Allow a bare % in a query string. Fixes #958
+  * Explicitly listen on all localhost addresses. Fixes #782
+  * Fix `TCPLogger` log error in tcp cluster mode.
+  * Fix puma/puma#968 Cannot bind SSL port due to missing verify_mode option
+  * Fix puma/puma#968 Default verify_mode to peer
+  * Log any exceptions in ThreadPool. Fixes #1010
+  * Silence connection errors in the reactor. Fixes #959
+  * Tiny fixes in hook documentation for #840
+  * It should not log requests if we want it to be quiet
+
+* 5 doc fixes:
+  * Add How to stop Puma on Heroku using plugins to the example directory
+  * Provide both hot and phased restart in jungle script
+  * Update reference to the instances management script
+  * Update default number of threads
+  * Fix typo in example config
+
+* 14 PRs merged:
+  * Merge pull request #1007 from willnet/patch-1
+  * Merge pull request #1014 from jeznet/patch-1
+  * Merge pull request #1015 from bf4/patch-1
+  * Merge pull request #1017 from jorihardman/configurable_persistent_timeout
+  * Merge pull request #954 from jf/master
+  * Merge pull request #955 from jf/add-request-info-to-standard-error-rescue
+  * Merge pull request #956 from maxkwallace/master
+  * Merge pull request #960 from kmayer/kmayer-plugins-heroku-restart
+  * Merge pull request #969 from frankwong15/master
+  * Merge pull request #970 from willnet/delete-blank-document
+  * Merge pull request #974 from rocketjob/feature/name_threads
+  * Merge pull request #977 from snow/master
+  * Merge pull request #981 from zach-chai/patch-1
+  * Merge pull request #993 from scorix/master
+
+## 3.4.0 / 2016-04-07
+
+* 2 minor features:
+  * Add ability to force threads to stop on shutdown. Fixes #938
+  * Detect and commit seppuku when fork(2) fails. Fixes #529
+
+* 3 unknowns:
+  * Ignore errors trying to update the backport tables. Fixes #788
+  * Invoke the lowlevel_error in more places to allow for exception tracking. Fixes #894
+  * Update the query string when an absolute URI is used. Fixes #937
+
+* 5 doc fixes:
+  * Add Process Monitors section to top-level README
+  * Better document the hooks. Fixes #840
+  * docs/system.md sample config refinements and elaborations
+  * Fix typos at couple of places.
+  * Cleanup warnings
+
+* 3 PRs merged:
+  * Merge pull request #945 from dekellum/systemd-docs-refined
+  * Merge pull request #946 from vipulnsward/rm-pid
+  * Merge pull request #947 from vipulnsward/housekeeping-typos
+
+## 3.3.0 / 2016-04-05
+
+* 2 minor features:
+  * Allow overriding options of Configuration object
+  * Rename to inherit_ssl_listener like inherit_tcp|unix
+
+* 2 doc fixes:
+  * Add docs/systemd.md (with socket activation sub-section)
+  * Document UNIX signals with cluster on README.md
+
+* 3 PRs merged:
+  * Merge pull request #936 from prathamesh-sonpatki/allow-overriding-config-options
+  * Merge pull request #940 from kyledrake/signalsdoc
+  * Merge pull request #942 from dekellum/socket-activate-improve
+
+## 3.2.0 / 2016-03-20
+
+* 1 deprecation removal:
+  * Delete capistrano.rb
+
+* 3 bug fixes:
+  * Detect gems.rb as well as Gemfile
+  * Simplify and fix logic for directory to use when restarting for all phases
+  * Speed up phased-restart start
+
+* 2 PRs merged:
+  * Merge pull request #927 from jlecour/gemfile_variants
+  * Merge pull request #931 from joneslee85/patch-10
+
+## 3.1.1 / 2016-03-17
+
+* 4 bug fixes:
+  * Disable USR1 usage on JRuby
+  * Fixes #922 - Correctly define file encoding as UTF-8
+  * Set a more explicit SERVER_SOFTWARE Rack variable
+  * Show RUBY_ENGINE_VERSION if available. Fixes #923
+
+* 3 PRs merged:
+  * Merge pull request #912 from tricknotes/fix-allow-failures-in-travis-yml
+  * Merge pull request #921 from swrobel/patch-1
+  * Merge pull request #924 from tbrisker/patch-1
+
+## 3.1.0 / 2016-03-05
+
+* 1 minor feature:
+  * Add 'import' directive to config file. Fixes #916
+
+* 5 bug fixes:
+  * Add 'fetch' to options. Fixes #913
+  * Fix jruby daemonization. Fixes #918
+  * Recreate the proper args manually. Fixes #910
+  * Require 'time' to get iso8601. Fixes #914
+
+## 3.0.2 / 2016-02-26
+
+* 5 bug fixes:
+
+  * Fix 'undefined local variable or method `pid` for #<Puma::ControlCLI:0x007f185fcef968>' when execute pumactl with `--pid` option.
+  * Fix 'undefined method `windows?` for Puma:Module' when execute pumactl.
+  * Harden tmp_restart against errors related to the restart file
+  * Make `plugin :tmp_restart` behavior correct in Windows.
+  * fix uninitialized constant Puma::ControlCLI::StateFile
+
+* 3 PRs merged:
+
+  * Merge pull request #901 from mitto/fix-pumactl-uninitialized-constant-statefile
+  * Merge pull request #902 from corrupt952/fix_undefined_method_and_variable_when_execute_pumactl
+  * Merge pull request #905 from Eric-Guo/master
+
+## 3.0.1 / 2016-02-25
+
+* 1 bug fix:
+
+  * Removed the experimental support for async.callback as it broke
+    websockets entirely. Seems no server has both hijack and async.callback
+    and thus faye is totally confused what to do and doesn't work.
+
+## 3.0.0 / 2016-02-25
+
+* 2 major changes:
+
+  * Ruby pre-2.0 is no longer supported. We'll do our best to not add
+    features that break those rubies but will no longer be testing
+    with them.
+  * Don't log requests by default. Fixes #852
+
+* 2 major features:
+
+  * Plugin support! Plugins can interact with configuration as well
+    as provide augment server functionality!
+  * Experimental env['async.callback'] support
+
+* 4 minor features:
+
+  * Listen to unix socket with provided backlog if any
+  * Improves the clustered stats to report worker stats
+  * Pass the env to the lowlevel_error handler. Fixes #854
+  * Treat path-like hosts as unix sockets. Fixes #824
+
+* 5 bug fixes:
+
+  * Clean thread locals when using keepalive. Fixes #823
+  * Cleanup compiler warnings. Fixes #815
+  * Expose closed? for use by the reactor. Fixes #835
+  * Move signal handlers to separate method to prevent space leak. Fixes #798
+  * Signal not full on worker exit #876
+
+* 5 doc fixes:
+
+  * Update README.md with various grammar fixes
+  * Use newest version of Minitest
+  * Add directory configuration docs, fix typo [ci skip]
+  * Remove old COPYING notice. Fixes #849
+
+* 10 merged PRs:
+
+  * Merge pull request #871 from deepj/travis
+  * Merge pull request #874 from wallclockbuilder/master
+  * Merge pull request #883 from dadah89/igor/trim_only_worker
+  * Merge pull request #884 from uistudio/async-callback
+  * Merge pull request #888 from mlarraz/tick_minitest
+  * Merge pull request #890 from todd/directory_docs
+  * Merge pull request #891 from ctaintor/improve_clustered_status
+  * Merge pull request #893 from spastorino/add_missing_require
+  * Merge pull request #897 from zendesk/master
+  * Merge pull request #899 from kch/kch-readme-fixes
+
+## 2.16.0 / 2016-01-27
 
 * 7 minor features:
 
@@ -38,13 +662,13 @@
   * Merge pull request #860 from zendesk/expose_old_worker_count
   * Merge pull request #861 from zendesk/allow_control_url_umask
 
-=== 2.15.3 / 2015-11-07
+## 2.15.3 / 2015-11-07
 
 * 1 bug fix:
 
   * Fix JRuby parser
 
-=== 2.15.2 / 2015-11-06
+## 2.15.2 / 2015-11-06
 
 * 2 bug fixes:
   * ext/puma_http11: handle duplicate headers as per RFC
@@ -54,13 +678,13 @@
   * Merge pull request #818 from unleashed/support-duplicate-headers
   * Merge pull request #819 from VictorLowther/fix-ca-and-verify_null-exception
 
-=== 2.15.1 / 2015-11-06
+## 2.15.1 / 2015-11-06
 
 * 1 bug fix:
 
   * Allow older openssl versions
 
-=== 2.15.0 / 2015-11-06
+## 2.15.0 / 2015-11-06
 
 * 6 minor features:
   * Allow setting ca without setting a verify mode
@@ -109,7 +733,7 @@
   * Merge pull request #814 from schneems/schneems/worker_timeout-docs
   * Merge pull request #817 from unleashed/worker-boot-timeout
 
-=== 2.14.0 / 2015-09-18
+## 2.14.0 / 2015-09-18
 
 * 1 minor feature:
   * Make building with SSL support optional
@@ -117,33 +741,33 @@
 * 1 bug fix:
   * Use Rack::Builder if available. Fixes #735
 
-=== 2.13.4 / 2015-08-16
+## 2.13.4 / 2015-08-16
 
 * 1 bug fix:
   * Use the environment possible set by the config early and from
     the config file later (if set).
 
-=== 2.13.3 / 2015-08-15
+## 2.13.3 / 2015-08-15
 
 Seriously, I need to revamp config with tests.
 
 * 1 bug fix:
   * Fix preserving options before cleaning for state. Fixes #769
 
-=== 2.13.2 / 2015-08-15
+## 2.13.2 / 2015-08-15
 
 The "clearly I don't have enough tests for the config" release.
 
 * 1 bug fix:
   * Fix another place binds wasn't initialized. Fixes #767
 
-=== 2.13.1 / 2015-08-15
+## 2.13.1 / 2015-08-15
 
 * 2 bug fixes:
   * Fix binds being masked in config files. Fixes #765
   * Use options from the config file properly in pumactl. Fixes #764
 
-=== 2.13.0 / 2015-08-14
+## 2.13.0 / 2015-08-14
 
 * 1 minor feature:
   * Add before_fork hooks option.
@@ -162,7 +786,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #759 from BenV/fix-centos6-build
   * Merge pull request #761 from looker/no-log
 
-=== 2.12.3 / 2015-08-03
+## 2.12.3 / 2015-08-03
 
 * 8 minor bugs fixed:
   * Fix Capistrano 'uninitialized constant Puma' error.
@@ -183,13 +807,13 @@ The "clearly I don't have enough tests for the config" release.
 * 1 test fix:
   * Add 1.8.7, rbx-1 (allow failures) to Travis.
 
-=== 2.12.2 / 2015-07-17
+## 2.12.2 / 2015-07-17
 
 * 2 bug fix:
   * Pull over and use Rack::URLMap. Fixes #741
   * Stub out peercert on JRuby for now. Fixes #739
 
-=== 2.12.1 / 2015-07-16
+## 2.12.1 / 2015-07-16
 
 * 2 bug fixes:
   * Use a constant format. Fixes #737
@@ -201,7 +825,7 @@ The "clearly I don't have enough tests for the config" release.
 * 1 PR merged:
   * Merge pull request #736 from paulanunda/paulanunda/typo-fix
 
-=== 2.12.0 / 2015-07-14
+## 2.12.0 / 2015-07-14
 
 * 13 bug fixes:
   * Add thread reaping to thread pool
@@ -250,7 +874,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #729 from allaire/patch-1
   * Merge pull request #730 from iamjarvo/container-infrastructure
 
-=== 2.11.3 / 2015-05-18
+## 2.11.3 / 2015-05-18
 
 * 5 bug fixes:
   * Be sure to unlink tempfiles after a request. Fixes #690
@@ -261,7 +885,7 @@ The "clearly I don't have enough tests for the config" release.
 * 1 PR merged:
   * Merge pull request #698 from looker/hang-handshake
 
-=== 2.11.2 / 2015-04-11
+## 2.11.2 / 2015-04-11
 
 * 2 minor features:
   * Add `on_worker_fork` hook, which allows to mimic Unicorn's behavior
@@ -284,7 +908,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #667 from JuanitoFatas/doc/gemspec
   * Merge pull request #672 from chulkilee/refactor
 
-=== 2.11.1 / 2015-02-11
+## 2.11.1 / 2015-02-11
 
 * 2 bug fixes:
   * Avoid crash in strange restart conditions
@@ -294,7 +918,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #644 from bpaquet/master
   * Merge pull request #646 from mkonecny/master
 
-=== 2.11.0 / 2015-01-20
+## 2.11.0 / 2015-01-20
 
 * 9 bug fixes:
   * Add mode as an additional bind option to unix sockets. Fixes #630
@@ -327,7 +951,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #639 from ebeigarts/fix-phased-restarts
   * Merge pull request #640 from codehotter/issue-612-dependent-requests-deadlock
 
-=== 2.10.2 / 2014-11-26
+## 2.10.2 / 2014-11-26
 
 * 1 bug fix:
   * Conditionalize thread local cleaning, fixes perf degradation fix
@@ -335,7 +959,7 @@ The "clearly I don't have enough tests for the config" release.
     overhead to a each request, so it has to be turned on explicitly
     if a user needs it.
 
-=== 2.10.1 / 2014-11-24
+## 2.10.1 / 2014-11-24
 
 * 1 bug fix:
   * Load the app after daemonizing because the app might start threads.
@@ -346,7 +970,7 @@ The "clearly I don't have enough tests for the config" release.
   If you're app has problems starting up, start it without daemon mode initially
   to test.
 
-=== 2.10.0 / 2014-11-23
+## 2.10.0 / 2014-11-23
 
 * 3 minor features:
   * Added on_worker_shutdown hook mechanism
@@ -375,7 +999,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #608 from Gu1/master
   * Merge remote-tracking branch 'origin/pr/538'
 
-=== 2.9.2 / 2014-10-25
+## 2.9.2 / 2014-10-25
 
 * 8 bug fixes:
   * Fix puma-wild handling a restart properly. Fixes #550
@@ -395,7 +1019,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #581 from alexch/slightly-better-logging
   * Merge pull request #590 from looker/jruby_disable_sslv3
 
-=== 2.9.1 / 2014-09-05
+## 2.9.1 / 2014-09-05
 
 * 4 bug fixes:
   * Cleanup the SSL related structures properly, fixes memory leak
@@ -407,7 +1031,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #561 from theoldreader/sighup
   * Merge pull request #570 from havenwood/spawn-thread-edge-case
 
-=== 2.9.0 / 2014-07-12
+## 2.9.0 / 2014-07-12
 
 * 1 minor feature:
   * Add SSL support for JRuby
@@ -431,7 +1055,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #544 from chulkilee/bsd-3-clause
   * Merge pull request #551 from jcxplorer/patch-1
 
-=== 2.8.2 / 2014-04-12
+## 2.8.2 / 2014-04-12
 
 * 4 bug fixes:
   * During upgrade, change directory in main process instead of workers.
@@ -458,7 +1082,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #517 from misfo/patch-1
   * Merge pull request #518 from LongMan/master
 
-=== 2.8.1 / 2014-03-06
+## 2.8.1 / 2014-03-06
 
 * 1 bug fixes:
   * Run puma-wild with proper deps for prune_bundler
@@ -474,7 +1098,7 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #490 from tobinibot/patch-1
   * Merge pull request #491 from brianknight10/clarify-no-config
 
-=== 2.8.0 / 2014-02-28
+## 2.8.0 / 2014-02-28
 
 * 8 minor features:
   * Add ability to autoload a config file. Fixes #438
@@ -517,13 +1141,13 @@ The "clearly I don't have enough tests for the config" release.
   * Merge pull request #482 from prathamesh-sonpatki/signals-doc-cleanup
   * Merge pull request #483 from YotpoLtd/master
 
-=== 2.7.1 / 2013-12-05
+## 2.7.1 / 2013-12-05
 
 * 1 bug fix:
 
   * Keep STDOUT/STDERR the right mode. Fixes #422
 
-=== 2.7.0 / 2013-12-03
+## 2.7.0 / 2013-12-03
 
 * 1 minor feature:
   * Adding TTIN and TTOU to increment/decrement workers
@@ -540,7 +1164,7 @@ The "clearly I don't have enough tests for the config" release.
   * Increase the max URI path length to 2048 chars from 1024 chars
   * Upstart jungle use config/puma.rb instead
 
-=== 2.6.0 / 2013-09-13
+## 2.6.0 / 2013-09-13
 
 * 2 minor features:
   * Add support for event hooks
@@ -553,14 +1177,14 @@ The "clearly I don't have enough tests for the config" release.
   * Handle BrokenPipe, StandardError and IOError in fat_wrote and break out
   * Return success status to the invoking environment
 
-=== 2.5.1 / 2013-08-13
+## 2.5.1 / 2013-08-13
 
 * 2 bug fixes:
 
   * Keep jruby daemon mode from retrying on a hot restart
   * Extract version from const.rb in gemspec
 
-=== 2.5.0 / 2013-08-08
+## 2.5.0 / 2013-08-08
 
 * 2 minor features:
   * Allow configuring pumactl with config.rb
@@ -582,12 +1206,12 @@ The "clearly I don't have enough tests for the config" release.
   * Remove obsolete pumactl instructions; refer to pumactl for details
   * Make Bundler used puma.gemspec version agnostic
 
-=== 2.4.1 / 2013-08-07
+## 2.4.1 / 2013-08-07
 
 * 1 experimental feature:
   * Support raw tcp servers (aka Lopez Express mode)
 
-=== 2.4.0 / 2013-07-22
+## 2.4.0 / 2013-07-22
 
 * 5 minor features:
   * Add PUMA_JRUBY_DAEMON_OPTS to get around agent starting twice
@@ -610,13 +1234,13 @@ The "clearly I don't have enough tests for the config" release.
   * Use 127.0.0.1 as REMOTE_ADDR of unix client. Fixes #309
 
 
-=== 2.3.2 / 2013-07-08
+## 2.3.2 / 2013-07-08
 
 * 1 bug fix:
 
   * Move starting control server to after daemonization.
 
-=== 2.3.1 / 2013-07-06
+## 2.3.1 / 2013-07-06
 
 * 2 bug fixes:
 
@@ -626,7 +1250,7 @@ The "clearly I don't have enough tests for the config" release.
 * 1 doc change:
   * Better document some platform constraints
 
-=== 2.3.0 / 2013-07-05
+## 2.3.0 / 2013-07-05
 
 * 1 major bug fix:
 
@@ -645,13 +1269,13 @@ The "clearly I don't have enough tests for the config" release.
   * Refactored modes into seperate classes that CLI uses
   * Changed CLI to take an Events object instead of stdout/stderr (API change)
 
-=== 2.2.2 / 2013-07-02
+## 2.2.2 / 2013-07-02
 
 * 1 bug fix:
 
   * Fix restart_command in the config
 
-=== 2.2.1 / 2013-07-02
+## 2.2.1 / 2013-07-02
 
 * 1 minor feature:
 
@@ -661,7 +1285,7 @@ The "clearly I don't have enough tests for the config" release.
 
   * Pass custom restart command in JRuby
 
-=== 2.2.0 / 2013-07-01
+## 2.2.0 / 2013-07-01
 
 * 1 major feature:
 
@@ -672,14 +1296,14 @@ The "clearly I don't have enough tests for the config" release.
   * Don't leak info when not in development. Fixes #256
   * Load the app, then bind the ports
 
-=== 2.1.1 / 2013-06-20
+## 2.1.1 / 2013-06-20
 
 * 2 minor bug fixes:
 
   * Fix daemonization on jruby
   * Load the application before daemonizing. Fixes #285
 
-=== 2.1.0 / 2013-06-18
+## 2.1.0 / 2013-06-18
 
 * 3 minor features:
   * Allow listening socket to be configured via Capistrano variable
@@ -708,13 +1332,13 @@ The "clearly I don't have enough tests for the config" release.
   * Add some documentation for Clustered mode
   * Added quotes to /etc/puma.conf
 
-=== 2.0.1 / 2013-04-30
+## 2.0.1 / 2013-04-30
 
 * 1 bug fix:
 
   * Fix not starting on JRuby properly
 
-=== 2.0.0 / 2013-04-29
+## 2.0.0 / 2013-04-29
 
 RailsConf 2013 edition!
 
@@ -731,7 +1355,7 @@ RailsConf 2013 edition!
   * Fix stdout/stderr logs to sync outputs
   * allow binding to IPv6 addresses
 
-=== 2.0.0.b7 / 2013-03-18
+## 2.0.0.b7 / 2013-03-18
 
 * 5 minor enhancements:
 
@@ -756,7 +1380,7 @@ RailsConf 2013 edition!
   * Write out the state post-daemonize. Fixes #189
   * Prevent crash when all workers are gone
 
-=== 2.0.0.b6 / 2013-02-06
+## 2.0.0.b6 / 2013-02-06
 
 * 2 minor enhancements:
 
@@ -767,7 +1391,7 @@ RailsConf 2013 edition!
 
   * Change directory in working during upgrade. Fixes #185
 
-=== 2.0.0.b5 / 2013-02-05
+## 2.0.0.b5 / 2013-02-05
 
 * 2 major features:
   * Add phased worker upgrade
@@ -784,7 +1408,7 @@ RailsConf 2013 edition!
   * Move write_pid to after we daemonize. Fixes #180
   * Redirect IO properly and emit message for checkpointing
 
-=== 2.0.0.b4 / 2012-12-12
+## 2.0.0.b4 / 2012-12-12
 
 * 4 bug fixes:
   * Properly check #syswrite's value for variable sized buffers. Fixes #170
@@ -792,12 +1416,12 @@ RailsConf 2013 edition!
   * Handle char vs byte and mixing syswrite with write properly
   * made MiniSSL validate key/cert file existence
 
-=== 2.0.0.b3 / 2012-11-22
+## 2.0.0.b3 / 2012-11-22
 
 * 1 bug fix:
   * Package right files in gem
 
-=== 2.0.0.b2 / 2012-11-18
+## 2.0.0.b2 / 2012-11-18
 * 5 minor feature:
   * Now Puma is bundled with an capistrano recipe. Just require
      'puma/capistrano' in you deploy.rb
@@ -815,7 +1439,7 @@ RailsConf 2013 edition!
   * Be sure to empty the drain the todo before shutting down. Fixes #155
   * allow for alternate locations for status app
 
-=== 2.0.0.b1 / 2012-09-11
+## 2.0.0.b1 / 2012-09-11
 
 * 1 major feature:
   * Optional worker process mode (-w) to allow for process scaling in
@@ -828,32 +1452,32 @@ RailsConf 2013 edition!
 NOTE: SSL support in JRuby is not supported at present. Support will
 be added back in a future date when a java Puma::MiniSSL is added.
 
-=== 1.6.3 / 2012-09-04
+## 1.6.3 / 2012-09-04
 
 * 1 bug fix:
   * Close sockets waiting in the reactor when a hot restart is performed
     so that browsers reconnect on the next request
 
-=== 1.6.2 / 2012-08-27
+## 1.6.2 / 2012-08-27
 
 * 1 bug fix:
   * Rescue StandardError instead of IOError to handle SystemCallErrors
     as well as other application exceptions inside the reactor.
 
-=== 1.6.1 / 2012-07-23
+## 1.6.1 / 2012-07-23
 
 * 1 packaging bug fixed:
   * Include missing files
 
-=== 1.6.0 / 2012-07-23
+## 1.6.0 / 2012-07-23
 
 * 1 major bug fix:
   * Prevent slow clients from starving the server by introducing a
     dedicated IO reactor thread. Credit for reporting goes to @meh.
 
-=== 1.5.0 / 2012-07-19
+## 1.5.0 / 2012-07-19
 
-* 7 contributers to this release:
+* 7 contributors to this release:
   * Christian Mayer
   * Darío Javier Cravero
   * Dirkjan Bussink
@@ -875,7 +1499,7 @@ be added back in a future date when a java Puma::MiniSSL is added.
   * Allow Server#run to run sync. Fixes #111
   * Puma can now run on windows
 
-=== 1.4.0 / 2012-06-04
+## 1.4.0 / 2012-06-04
 
 * 1 bug fix:
   * SCRIPT_NAME should be passed from env to allow mounting apps
@@ -883,13 +1507,13 @@ be added back in a future date when a java Puma::MiniSSL is added.
 * 1 experimental feature:
   * Add puma.socket key for direct socket access
 
-=== 1.3.1 / 2012-05-15
+## 1.3.1 / 2012-05-15
 
 * 2 bug fixes:
   * use #bytesize instead of #length for Content-Length header
   * Use StringIO properly. Fixes #98
 
-=== 1.3.0 / 2012-05-08
+## 1.3.0 / 2012-05-08
 
 * 2 minor features:
   * Return valid Rack responses (passes Lint) from status server
@@ -901,10 +1525,10 @@ be added back in a future date when a java Puma::MiniSSL is added.
   * Only stop the status server if it's started. Fixes #84
   * Set RACK_ENV early in cli also. Fixes #78
 
-* 1 new contributer:
+* 1 new contributor:
   * Jesse Cooke
 
-=== 1.2.2 / 2012-04-28
+## 1.2.2 / 2012-04-28
 
 * 4 bug fixes:
 
@@ -913,13 +1537,13 @@ be added back in a future date when a java Puma::MiniSSL is added.
   * Keep the encoding of the body correct. Fixes #79
   * show error.to_s along with backtrace for low-level error
 
-=== 1.2.1 / 2012-04-11
+## 1.2.1 / 2012-04-11
 
  1 bug fix:
 
    * Fix rack.url_scheme for SSL servers. Fixes #65
 
-=== 1.2.0 / 2012-04-11
+## 1.2.0 / 2012-04-11
 
  1 major feature:
 
@@ -937,20 +1561,20 @@ be added back in a future date when a java Puma::MiniSSL is added.
     * Fix reporting https only on a true SSL connection
     * Set the default content type to 'text/plain'. Fixes #63
     * Use REUSEADDR. Fixes #60
-    * Shutdown gracefull on SIGTERM. Fixes #53
+    * Shutdown gracefully on SIGTERM. Fixes #53
 
- 2 new contributers:
+ 2 new contributors:
 
    * Seamus Abshere
    * Steve Richert
 
-=== 1.1.1 / 2012-03-30
+## 1.1.1 / 2012-03-30
 
  1 bugfix:
 
    * Include puma/compat.rb in the gem (oops!)
 
-=== 1.1.0 / 2012-03-30
+## 1.1.0 / 2012-03-30
 
  1 bugfix:
 
@@ -960,6 +1584,15 @@ be added back in a future date when a java Puma::MiniSSL is added.
 
    * Add umask param to the unix:// bind to set the umask
 
-=== 1.0.0 / 2012-03-29
+## 1.0.0 / 2012-03-29
 
 * Released!
+
+## Ignore - this is for maintainers to copy-paste during release
+## Master
+
+* Features
+  * Your feature goes here (#Github Number)
+
+* Bugfixes
+  * Your bugfix goes here (#Github Number)