Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge.

  • Loading branch information...
commit c1308ca5a8fe85aae012611ad65eacf0b29ec076 2 parents 58f4d98 + 53819e2
@Licenser Licenser authored
View
3  apps/chunter/src/chunter_protocol.erl
@@ -133,7 +133,8 @@ handle_info({_Closed, _}, State = #state{ closed = _Closed}) ->
handle_info(_Info, State) ->
{noreply, State}.
--spec handle_message(Message::fifo:chunter_message(), State::term()) -> {stop, term()}.
+-spec handle_message(Message::fifo:chunter_message(), State::term()) ->
+ {stop, term()} | {stop, term(), term()}.
handle_message({machines, start, UUID}, State) when is_binary(UUID) ->
chunter_vmadm:start(UUID),
View
2  apps/chunter/src/chunter_vmadm.erl
@@ -54,7 +54,7 @@ start(UUID, Image) ->
lager:debug("[vmadm] ~s", [R]),
R.
--spec delete(UUID::fifo:uuid(), Mem::binary()) -> ok.
+-spec delete(UUID::fifo:uuid(), Mem::number()) -> ok.
delete(UUID, Mem) ->
lager:info([{fifi_component, chunter}],
View
16 rebar.config
@@ -10,16 +10,16 @@
{eunit_opts, [{report,{eunit_surefire,[{dir,"."}]}}]}.
{deps,
[
- {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "1.0.0"}}},
+ {lager, ".*", {git, "git://github.com/basho/lager.git", {tag, "1.2.2"}}},
{jsx, ".*", {git, "http://github.com/talentdeficit/jsx.git", {tag, "v1.3.3"}}},
{erlsom, ".*", {git, "http://github.com/willemdj/erlsom.git", {tag, "bc48604f7a74440da66aa7dba95a3bf634fdf138"}}},
- {ranch, "0.4.*", {git, "https://github.com/extend/ranch.git", {tag, "0.4.0"}}},
+ {ranch, "0.8.*", {git, "https://github.com/extend/ranch.git", {tag, "0.8.1"}}},
{erltrace, ".*", {git, "https://github.com/project-fifo/erltrace.git", {tag, "0.1.2"}}},
- {jsxd, ".*", {git, "http://github.com/Licenser/jsxd.git", {tag, "0.1.5"}}},
- {eplugin, ".*", {git, "http://github.com/Licenser/eplugin.git", {tag, "0.1.0"}}},
+ {jsxd, ".*", {git, "http://github.com/Licenser/jsxd.git", {tag, "0.1.6"}}},
+ {eplugin, ".*", {git, "http://github.com/Licenser/eplugin.git", {tag, "0.1.1"}}},
{ekstat, ".*", {git, "https://github.com/Licenser/ekstat.git", {tag, "0.1.0"}}},
- {libsniffle, ".*", {git, "http://github.com/project-fifo/libsniffle.git", {tag, "0.2.4"}}},
- {libsnarl, ".*", {git, "http://github.com/project-fifo/libsnarl.git", {tag, "0.2.4"}}},
- {libhowl, ".*", {git, "http://github.com/project-fifo/libhowl.git", {tag, "0.1.5"}}},
- {fifo_spec, ".*", {git, "https://github.com/project-fifo/fifo_spec.git", {tag, "0.1.0"}}}
+ {libsniffle, ".*", {git, "http://github.com/project-fifo/libsniffle.git", {tag, "0.2.6"}}},
+ {libsnarl, ".*", {git, "http://github.com/project-fifo/libsnarl.git", {tag, "0.2.5"}}},
+ {libhowl, ".*", {git, "http://github.com/project-fifo/libhowl.git", {tag, "0.1.6"}}},
+ {fifo_spec, ".*", {git, "https://github.com/project-fifo/fifo_spec.git", {tag, "0.1.2"}}}
]}.
Please sign in to comment.
Something went wrong with that request. Please try again.