Merge pull request #362 from basho/dr/update_locked_deps_for_2.1.2_rc6

Update locked deps and fix reltool.config for 2.1.2 rc6
basho · Nov 25, 2015 · 72e8ec3 · 72e8ec3
2 parents d7e4749 + 1dd6fdd
commit 72e8ec3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rebar.config.lock b/rebar.config.lock
@@ -153,7 +153,7 @@
                           "ab3f924cc40b9c7605721478a8085109c197e78a"}},
        {riaknostic,".*",
                    {git,"git://github.com/basho/riaknostic.git",
-                        "8e41c49c2be59680e1d8f70505026194514c9678"}},
+                        "84c0aa56e4eadc3e25cb36bd6373b12ab8a04210"}},
        {kvc,".*",
             {git,"git://github.com/etrepum/kvc.git",
                  "5565fe51857747662410cc3c06362ebcf48a2f04"}},
@@ -162,7 +162,7 @@
                      "e8ae353c16d4f0897abb9f80025b52925b974dd1"}},
        {yokozuna,".*",
                  {git,"git://github.com/basho/yokozuna.git",
-                      "6954c852f2346f1f362a6d35dbcfe6775a1ba541"}},
+                      "3520d11ec21ee08b7c18478fbbe1b61d7e3d8e0f"}},
        {canola,".*",
                {git,"git://github.com/basho/canola.git",
                     "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},

diff --git a/rel/reltool.config b/rel/reltool.config
@@ -2,7 +2,7 @@
 %% ex: ft=erlang ts=4 sw=4 et
 {sys, [
        {lib_dirs, ["../deps", "../deps/riak_search/apps"]},
-       {rel, "riak", "2.1.1",
+       {rel, "riak", "2.1.2",
         [
          kernel,
          stdlib,