diff --git a/.gitignore b/.gitignore index 7cf84a4..7cd2281 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ ebin rel/example_project .concrete/DEV_MODE .rebar -rebar.lock _build/ priv/ doc/ diff --git a/mix.exs b/mix.exs index 46de3ed..add3c34 100644 --- a/mix.exs +++ b/mix.exs @@ -18,9 +18,9 @@ defmodule EredisCluster.Mixfile do end defp deps do - [{:poolboy, "~> 1.5.1"}, - {:eredis, "~> 1.1.0"}, - {:ex_doc, ">= 0.0.0", only: :dev}] + [{:poolboy, git: "https://github.com/devinus/poolboy.git", tag: "1.5.2"}, + {:eredis, "~> 1.2.0"}, + {:ex_doc, "~> 0.19.1"}] end defp package do diff --git a/mix.lock b/mix.lock index ee3e47d..309c526 100644 --- a/mix.lock +++ b/mix.lock @@ -1,4 +1,9 @@ -%{"earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [:mix], [], "hexpm"}, - "eredis": {:hex, :eredis, "1.1.0", "8d8d74496f35216679b97726b75fb1c8715e99dd7f3ef9f9824a2264c3e0aac0", [:rebar3], [], "hexpm"}, - "ex_doc": {:hex, :ex_doc, "0.16.2", "3b3e210ebcd85a7c76b4e73f85c5640c011d2a0b2f06dcdf5acdb2ae904e5084", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}], "hexpm"}, - "poolboy": {:hex, :poolboy, "1.5.1", "6b46163901cfd0a1b43d692657ed9d7e599853b3b21b95ae5ae0a777cf9b6ca8", [:rebar], [], "hexpm"}} +%{ + "earmark": {:hex, :earmark, "1.2.6", "b6da42b3831458d3ecc57314dff3051b080b9b2be88c2e5aa41cd642a5b044ed", [:mix], [], "hexpm"}, + "eredis": {:hex, :eredis, "1.2.0", "0b8e9cfc2c00fa1374cd107ea63b49be08d933df2cf175e6a89b73dd9c380de4", [:rebar3], [], "hexpm"}, + "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, + "makeup": {:hex, :makeup, "0.5.4", "71fbff7079cf2a6371cae11f193233842300a895c8de9d97e09c39a5d77d1f0d", [:mix], [{:nimble_parsec, "~> 0.4", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm"}, + "makeup_elixir": {:hex, :makeup_elixir, "0.8.1", "54a4deadaa0c6b6d467362fea29ac002420b083eb2484d9e1aa13931dbc22b58", [:mix], [{:makeup, "~> 0.5.4", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm"}, + "nimble_parsec": {:hex, :nimble_parsec, "0.4.0", "ee261bb53214943679422be70f1658fff573c5d0b0a1ecd0f18738944f818efe", [:mix], [], "hexpm"}, + "poolboy": {:git, "https://github.com/devinus/poolboy.git", "29be47db8c2be38b18c908e43a80ebb7b9b6116b", [tag: "1.5.2"]}, +} diff --git a/rebar.config b/rebar.config index 08c34c1..37eb149 100644 --- a/rebar.config +++ b/rebar.config @@ -11,4 +11,6 @@ {pretty_print, erl_pp}, {preprocess, true}]}. -{deps, [{eredis, "1.1.0"}, {poolboy, "1.5.1"}]}. +{deps, [{eredis, "1.2.0"}, + {poolboy, {git, "https://github.com/devinus/poolboy", {tag, "1.5.2"}}} + ]}. diff --git a/rebar.lock b/rebar.lock new file mode 100644 index 0000000..c3883fa --- /dev/null +++ b/rebar.lock @@ -0,0 +1,10 @@ +{"1.1.0", +[{<<"eredis">>,{pkg,<<"eredis">>,<<"1.2.0">>},0}, + {<<"poolboy">>, + {git,"https://github.com/devinus/poolboy", + {ref,"29be47db8c2be38b18c908e43a80ebb7b9b6116b"}}, + 0}]}. +[ +{pkg_hash,[ + {<<"eredis">>, <<"0B8E9CFC2C00FA1374CD107EA63B49BE08D933DF2CF175E6A89B73DD9C380DE4">>}]} +].