Skip to content

Commit

Permalink
bump to 1.17.2
Browse files Browse the repository at this point in the history
  • Loading branch information
benoitc committed Mar 17, 2021
1 parent 3520f86 commit 4cd8a5f
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 8 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
2012-2020 (c) Benoît Chesneau <[email protected]>
2012-2021 (c) Benoît Chesneau <[email protected]>

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
7 changes: 7 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# NEWS

1.17.2 - 2021-03-16
-------------------

- use parse_trans 3.3.1 only (fix compatibility with Erlang < 21)
- bump certifi version
- Allow merging of SSL opts

1.17.1 - 2021-03-15
-------------------

Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
hackney
-------

2012-2020 (c) Benoît Chesneau <[email protected]>
2012-2021 (c) Benoît Chesneau <[email protected]>

hackney is released under the Apache 2 license. See the LICENSE file for
the complete license.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Copyright (c) 2012-2021 Benoît Chesneau.

__Version:__ 1.17.1
__Version:__ 1.17.2

# hackney

Expand Down
2 changes: 1 addition & 1 deletion doc/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Copyright (c) 2012-2021 Benoît Chesneau.

__Version:__ 1.17.1
__Version:__ 1.17.2

# hackney

Expand Down
8 changes: 7 additions & 1 deletion doc/hackney_connection.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
## Function Index ##


<table width="100%" border="1" cellspacing="0" cellpadding="2" summary="function index"><tr><td valign="top"><a href="#close-2">close/2</a></td><td></td></tr><tr><td valign="top"><a href="#connect-3">connect/3</a></td><td></td></tr><tr><td valign="top"><a href="#connect_options-3">connect_options/3</a></td><td></td></tr><tr><td valign="top"><a href="#controlling_process-3">controlling_process/3</a></td><td></td></tr><tr><td valign="top"><a href="#get_property-2">get_property/2</a></td><td></td></tr><tr><td valign="top"><a href="#is_ssl-1">is_ssl/1</a></td><td></td></tr><tr><td valign="top"><a href="#new-1">new/1</a></td><td></td></tr><tr><td valign="top"><a href="#setopts-3">setopts/3</a></td><td></td></tr><tr><td valign="top"><a href="#ssl_opts-2">ssl_opts/2</a></td><td></td></tr><tr><td valign="top"><a href="#sync_socket-2">sync_socket/2</a></td><td></td></tr></table>
<table width="100%" border="1" cellspacing="0" cellpadding="2" summary="function index"><tr><td valign="top"><a href="#close-2">close/2</a></td><td></td></tr><tr><td valign="top"><a href="#connect-3">connect/3</a></td><td></td></tr><tr><td valign="top"><a href="#connect_options-3">connect_options/3</a></td><td></td></tr><tr><td valign="top"><a href="#controlling_process-3">controlling_process/3</a></td><td></td></tr><tr><td valign="top"><a href="#get_property-2">get_property/2</a></td><td></td></tr><tr><td valign="top"><a href="#is_ssl-1">is_ssl/1</a></td><td></td></tr><tr><td valign="top"><a href="#merge_ssl_opts-2">merge_ssl_opts/2</a></td><td></td></tr><tr><td valign="top"><a href="#new-1">new/1</a></td><td></td></tr><tr><td valign="top"><a href="#setopts-3">setopts/3</a></td><td></td></tr><tr><td valign="top"><a href="#ssl_opts-2">ssl_opts/2</a></td><td></td></tr><tr><td valign="top"><a href="#sync_socket-2">sync_socket/2</a></td><td></td></tr></table>


<a name="functions"></a>
Expand Down Expand Up @@ -52,6 +52,12 @@

`is_ssl(Connection) -> any()`

<a name="merge_ssl_opts-2"></a>

### merge_ssl_opts/2 ###

`merge_ssl_opts(Host, OverrideOpts) -> any()`

<a name="new-1"></a>

### new/1 ###
Expand Down
4 changes: 2 additions & 2 deletions doc/overview.edoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

%%==============================================================================
%% Copyright 2012-2020 Benoît Chesneau
%% Copyright 2012-2021 Benoît Chesneau
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,7 @@


@copyright 2012-2021 Benoît Chesneau.
@version 1.17.1
@version 1.17.2
@title hackney - HTTP client library in Erlang

@doc
Expand Down
2 changes: 1 addition & 1 deletion src/hackney.app.src
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{application, hackney,
[
{description, "simple HTTP client"},
{vsn, "1.17.1"},
{vsn, "1.17.2"},
{registered, [hackney_pool]},
{applications, [kernel,
stdlib,
Expand Down

0 comments on commit 4cd8a5f

Please sign in to comment.