Merge branch 'master' into credo

Author: ream88

CHANGELOG.md

@@ -1,16 +1,25 @@
-Changelog
-=========
+# Changelog
+
+## v2.0.0 - TBA
+
+* Allow the redefinition of routes.
+* Make listen interface configurable.
+* Add SO_REUSEPORT.
+* Add support for parametric routes.
+* Switch from :simple_one_for_one to DynamicSupervisor.
+* Require at least Elixir 1.6.
+* Replace gun with mint.
 
 ## v1.0.0 - 26 Nov 2018
 
-  * Support for Plug 1.7 with `plug_cowboy` 1 and 2.
+* Support for Plug 1.7 with `plug_cowboy` 1 and 2.
 
 ## v0.9.0 - 30 Sept 2018
 
-  * Add support for Cowboy 2 thanks to @hassox
+* Add support for Cowboy 2 thanks to @hassox
 
 ## v0.6.0 - 2 Feb 2017
 
-  * Add support for Elixir v1.0
-  * Allow choosing the port number for a Bypass instance
-  * Bypass instances now only listen on the loopback interface
+* Add support for Elixir v1.0
+* Allow choosing the port number for a Bypass instance
+* Bypass instances now only listen on the loopback interface