Skip to content

Commit

Permalink
Merge pull request #39 from lpgauth/upkeep/shackle
Browse files Browse the repository at this point in the history
Upgrade to Shackle 0.6.0
  • Loading branch information
lpgauth authored Jul 10, 2018
2 parents 1ef9022 + 46a5c6c commit 225fb8b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{murmur, ".*",
{git, "https://github.com/lpgauth/murmur.git", {tag, "0.1.0"}}},
{shackle, ".*",
{git, "https://github.com/lpgauth/shackle.git", {tag, "0.5.4"}}}
{git, "https://github.com/lpgauth/shackle.git", {tag, "0.6.0"}}}
]}.

{edoc_opts, [
Expand Down
2 changes: 1 addition & 1 deletion rebar.lock
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
0},
{<<"shackle">>,
{git,"https://github.com/lpgauth/shackle.git",
{ref,"2affa3623105a87732140773c9e66d3445f1649b"}},
{ref,"d8a837c36f6e675e91b7e78f249f233c78f45cd5"}},
0}].
6 changes: 3 additions & 3 deletions src/marina_client.erl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

-behavior(shackle_client).
-export([
init/0,
init/1,
setup/2,
handle_request/2,
handle_data/2,
Expand All @@ -22,10 +22,10 @@
-type state() :: #state {}.

%% shackle_server callbacks
-spec init() ->
-spec init(undefined) ->
{ok, state()}.

init() ->
init(_Opts) ->
{ok, #state {
frame_flags = marina_utils:frame_flags()
}}.
Expand Down

0 comments on commit 225fb8b

Please sign in to comment.