Merge pull request #17 from arjan/master

Upgrade hackney to 0.11.1
tsloughter · Apr 8, 2014 · 2be5c1b · unbalancedparentheses · Apr 10, 2014 · tsloughter
2 parents 8ed3392 + 9471a61
commit 2be5c1b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/rebar.config b/rebar.config
@@ -4,6 +4,6 @@
 {deps_dir, ["deps"]}.
 
 {deps, [
-       {hackney, "0.4.4", {git, "https://github.com/benoitc/hackney.git", {tag, "0.4.4"}}}
+       {hackney, "0.11.1", {git, "https://github.com/benoitc/hackney.git", {tag, "0.11.1"}}}
        ,{jsx, "1.4.1", {git, "https://github.com/talentdeficit/jsx.git", {tag, "v1.4.1"}}}       
        ]}.
diff --git a/src/erlastic_search.app.src b/src/erlastic_search.app.src
@@ -2,7 +2,7 @@
 %% application.
 {application, erlastic_search, 
   [{description, "An Erlang app for communicating with Elastic Search's rest interface."},
-   {vsn, "0.3.0"},
+   {vsn, "0.3.1"},
    {modules, []},
    {registered,[]},
    {applications, [kernel

diff --git a/src/erls_resource.erl b/src/erls_resource.erl
@@ -70,7 +70,7 @@ do_request(#erls_params{host=Host, port=Port, timeout=Timeout, ctimeout=CTimeout
         {ok, Status, _Headers, Client} when Status =:= 200
                                           ; Status =:= 201 ->
             case hackney:body(Client) of
-                {ok, RespBody, _Client1} ->
+                {ok, RespBody} ->
                     {ok, jsx:decode(RespBody)};
                 {error, _Reason} = Error ->
                     Error
@@ -100,3 +100,4 @@ default_content_length(B, H) ->
 make_body(Body, Headers, Options) ->
     {default_content_length(Body, Headers), Options, Body}.
 
+