Skip to content
This repository was archived by the owner on May 27, 2022. It is now read-only.

Commit cb8750b

Browse files
Merge pull request #2 from peterzeller/application-fix
Riak_pb update and include
2 parents 65f72c5 + 90e4189 commit cb8750b

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

rebar.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{deps, [
55
{lager, "3.6.1"},
6-
{riak_pb, ".*", {git, "git://github.com/syncfree/riak_pb", {tag, "v0.2.0"}}}
6+
{riak_pb, ".*", {git, "git://github.com/syncfree/riak_pb", {tag, "v0.6.0"}}}
77
]}.
88

99
{plugins, [

rebar.lock

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
[{<<"goldrush">>,
2-
{git,"git://github.com/DeadZen/goldrush.git",
3-
{ref,"212299233c7e7eb63a97be2777e1c05ebaa58dbe"}},
4-
1},
5-
{<<"lager">>,
6-
{git,"https://github.com/basho/lager",
7-
{ref,"8187757388c9adc915379caaab36a2f2ca26e944"}},
8-
0},
1+
[{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
2+
{<<"lager">>,{pkg,<<"lager">>,<<"3.6.1">>},0},
93
{<<"meck">>,
104
{git,"https://github.com/basho/meck.git",
115
{ref,"dde759050eff19a1a80fd854d7375174b191665d"}},
@@ -16,5 +10,5 @@
1610
1},
1711
{<<"riak_pb">>,
1812
{git,"git://github.com/syncfree/riak_pb",
19-
{ref,"322309b2bb69b38191a51b21247a71b5e412e656"}},
13+
{ref,"a0d45fdf5f09e96828cf3a4628ab6c7e2fe56bbc"}},
2014
0}].

src/antidote_pb.app.src

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@
77
kernel,
88
stdlib
99
]},
10+
{included_applications, [
11+
riak_pb
12+
]},
1013
{env, []}
1114
]}.

src/antidotec_pb_socket.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
-export([start_link/2,
5151
start_link/3,
52-
start/2,
52+
start/2,
5353
start/3,
5454
stop/1,
5555
handle_call/3,

tools.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
REBAR ?= $(shell pwd)/rebar3
22

33
test: compile
4-
${REBAR} eunit skip_deps=true
4+
${REBAR} eunit skip_deps=true
55

66
docs:
7-
${REBAR} doc skip_deps=true
7+
${REBAR} doc skip_deps=true
88

99
xref: compile
10-
${REBAR} xref skip_deps=true
10+
${REBAR} xref skip_deps=true
1111

1212
dialyzer: compile
1313
${REBAR} dialyzer

0 commit comments

Comments
 (0)