Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Commit

Permalink
Updates to let us build under Erlang R16B03.
Browse files Browse the repository at this point in the history
Fix crypto:md5, and update deps.
  • Loading branch information
markan committed Feb 7, 2015
1 parent 92d91e3 commit 7c49012
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion apps/pushy/src/pushy_object.erl
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ make_org_prefix_id(OrgId, Name) ->
%% assume couchdb guid where trailing part has uniqueness
<<_:20/binary, OrgSuffix:12/binary>> = OrgId,
Bin = iolist_to_binary([OrgId, Name, crypto:rand_bytes(6)]),
<<ObjectPart:80, _/binary>> = crypto:md5(Bin),
<<ObjectPart:80, _/binary>> = crypto:hash(md5, Bin),
iolist_to_binary(io_lib:format("~s~20.16.0b", [OrgSuffix, ObjectPart])).

assemble_job_ejson_with_nodes(#pushy_job{job_nodes = Nodes} = Job) ->
Expand Down
30 changes: 15 additions & 15 deletions rebar.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@
{lager, ".*",
{git, "https://github.com/basho/lager.git", {branch, "master"}}},
{meck, ".*",
{git, "git://github.com/eproxus/meck.git", {branch, "master"}}},
{git, "https://github.com/eproxus/meck.git", {branch, "master"}}},
{erlzmq, "2.0",
{git, "git://github.com/jamesc/erlzmq2.git", {branch, "2.1.11-max_sockets"}}},
{gproc, ".*", {git, "git://github.com/esl/gproc.git", {tag, "v0.2.11"}}},
{jiffy, ".*", {git, "git://github.com/davisp/jiffy.git", {tag, "0.4.3"}}},
{sqerl, ".*", {git, "git@github.com:opscode/sqerl.git", {branch, "master"}}},
{git, "https://github.com/jamesc/erlzmq2.git", {branch, "2.1.11-max_sockets"}}},
{gproc, ".*", {git, "https://github.com/esl/gproc.git", {tag, "v0.2.11"}}},
{jiffy, ".*", {git, "https://github.com/davisp/jiffy.git", {tag, "0.4.3"}}},
{sqerl, ".*", {git, "https://github.com/chef/sqerl.git", {branch, "master"}}},
{chef_authn, ".*",
{git, "git@github.com:opscode/chef_authn.git", {branch, "master"}}},
{git, "https://github.com/chef/chef_authn.git", {branch, "master"}}},
{pushy_common, ".*",
{git, "git@github.com:opscode/pushy_common.git", {branch, "master"}}},
{ej, ".*", {git, "git@github.com:seth/ej.git", {branch, "master"}}},
{git, "https://github.com/chef/pushy_common.git", {branch, "master"}}},
{ej, ".*", {git, "https://github.com/seth/ej.git", {branch, "master"}}},
{webmachine, ".*",
{git, "git://github.com/basho/webmachine", {tag, "1.10.1"}}},
{git, "https://github.com/opscode/webmachine", {tag, "1.10.5.3"}}},
{envy, ".*",
{git, "git@github.com:manderson26/envy.git", {branch, "master"}}},
{git, "https://github.com/manderson26/envy.git", {branch, "master"}}},
%% Not actually using this yet AFAIK
%% {mixer, ".*",
%% {git, "git@github.com:opscode/mixer.git", {branch, "master"}}},
%% {git, "https://github.com/opscode/mixer.git", {branch, "master"}}},
%% Monitoring and logging
{folsom, ".*",
{git, "git@github.com:opscode/folsom.git", {branch, "master"}}},
{git, "https://github.com/chef/folsom.git", {branch, "master"}}},
{folsom_graphite, ".*",
{git, "git@github.com:opscode/folsom_graphite.git", {branch, "master"}}},
{git, "https://github.com/chef/folsom_graphite.git", {branch, "master"}}},
{rebar_lock_deps_plugin, ".*",
{git, "git://github.com/seth/rebar_lock_deps_plugin.git", "master"}},
{git, "https://github.com/seth/rebar_lock_deps_plugin.git", "master"}},
%% Debuggging
{eper, ".*",
{git, "git://github.com/massemanet/eper.git", {branch, "master"}}}
{git, "https://github.com/massemanet/eper.git", {branch, "master"}}}

]}.

Expand Down

0 comments on commit 7c49012

Please sign in to comment.