aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-08-13 14:19:00 +0200
committerLoïc Hoguin <[email protected]>2018-08-13 14:19:00 +0200
commitcbe24f6fb9833474b22a06fc22cb1a8f168f7fbc (patch)
tree46e9fa7132398e50c213bb3f009bd944bb684a52
parent433276ccb6ed460b1dc65c8e48a808376cefecc2 (diff)
downloadranch-cbe24f6fb9833474b22a06fc22cb1a8f168f7fbc.tar.gz
ranch-cbe24f6fb9833474b22a06fc22cb1a8f168f7fbc.tar.bz2
ranch-cbe24f6fb9833474b22a06fc22cb1a8f168f7fbc.zip
Ranch 1.6.11.6.1
-rw-r--r--Makefile2
-rw-r--r--doc/src/guide/book.asciidoc2
-rw-r--r--doc/src/guide/migrating_from_1.6.asciidoc10
-rw-r--r--ebin/ranch.app2
4 files changed, 14 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ebd8f16..a803c33 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
PROJECT = ranch
PROJECT_DESCRIPTION = Socket acceptor pool for TCP protocols.
-PROJECT_VERSION = 1.6.0
+PROJECT_VERSION = 1.6.1
PROJECT_REGISTERED = ranch_server
# Options.
diff --git a/doc/src/guide/book.asciidoc b/doc/src/guide/book.asciidoc
index ed47388..7e8495d 100644
--- a/doc/src/guide/book.asciidoc
+++ b/doc/src/guide/book.asciidoc
@@ -29,6 +29,8 @@ include::internals.asciidoc[Internals]
include::upcoming_2.0_changes.asciidoc[Upcoming changes in Ranch 2.0]
+include::migrating_from_1.6.asciidoc[Changes since Ranch 1.6]
+
include::migrating_from_1.5.asciidoc[Migrating from Ranch 1.5 to 1.6]
include::migrating_from_1.x.asciidoc[Migrating from Ranch 1.x]
diff --git a/doc/src/guide/migrating_from_1.6.asciidoc b/doc/src/guide/migrating_from_1.6.asciidoc
new file mode 100644
index 0000000..3193f63
--- /dev/null
+++ b/doc/src/guide/migrating_from_1.6.asciidoc
@@ -0,0 +1,10 @@
+[appendix]
+== Changes since Ranch 1.6
+
+The following patch versions were released since Ranch 1.6:
+
+=== Ranch 1.6.1
+
+This release fixes a minor issue in the README and adds an
+undocumented function to help Cowboy deal with the transition
+from list to map for the transport options.
diff --git a/ebin/ranch.app b/ebin/ranch.app
index 4ac31c1..ed362cd 100644
--- a/ebin/ranch.app
+++ b/ebin/ranch.app
@@ -1,6 +1,6 @@
{application, 'ranch', [
{description, "Socket acceptor pool for TCP protocols."},
- {vsn, "1.6.0"},
+ {vsn, "1.6.1"},
{modules, ['ranch','ranch_acceptor','ranch_acceptors_sup','ranch_app','ranch_conns_sup','ranch_listener_sup','ranch_protocol','ranch_server','ranch_ssl','ranch_sup','ranch_tcp','ranch_transport']},
{registered, [ranch_sup,ranch_server]},
{applications, [kernel,stdlib,ssl]},