Merge pull request basho#177 from basho/rebar/zl/let-riakc-float-on-m…

…aster-and-update-rebar-lock-accordingly * rebar.config should use master version of riakc, * update rebar.config...
russelldb · Mar 30, 2015 · bde2208 · bde2208
2 parents 144f98a + 679430e
commit bde2208
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/rebar.config b/rebar.config
@@ -14,8 +14,8 @@
   {lager, "2.*", {git, "git://github.com/basho/lager", {tag, "2.1.0"}}},
   {ibrowse, ".*",
    {git, "git://github.com/cmullaparthi/ibrowse.git", {tag, "v4.0.2"}}},
-  {riakc, "2.1.*",
-   {git, "git://github.com/basho/riak-erlang-client", {tag, "2.1.0.1"}}},
+  {riakc, ".*",
+   {git, "git://github.com/basho/riak-erlang-client", {branch, "master"}}},
   {mochiweb, "2.9.*",
    {git, "git://github.com/basho/mochiweb", {tag, "v2.9.0"}}},
   {getopt, ".*",

diff --git a/rebar.config.lock b/rebar.config.lock
@@ -9,7 +9,7 @@
                   "b1882d7ee88e775d961a2678e4fafecef7f77705"}},
        {meck,".*",
              {git,"git://github.com/eproxus/meck",
-                  "98cdc40fe6ae7780491ed8d0db691dd15625e9b2"}},
+                  "b7024d3ddbca329c9fe51f4bc5c4f891b13b4522"}},
        {folsom,".*",
                {git,"git://github.com/basho/folsom.git",
                     "fc0401798a3e6a412856d1768c89c46d4c4e5231"}},
@@ -27,10 +27,10 @@
                         "f88fc3c6881687432ddd5546b3c7b08009dfb26f"}},
        {riak_pb,".*",
                 {git,"git://github.com/basho/riak_pb",
-                     "78c50efa698f33f7d6ab1c7f5fa4666ec03b46b4"}},
+                     "620bc7001dc788e5530078aa8be53c9d15d4fdb4"}},
        {riakc,".*",
               {git,"git://github.com/basho/riak-erlang-client",
-                   "d78e47ea2977e923204c7e34d23a952f234bd113"}},
+                   "1c75e31fd50e065aeebe787d608ce9b7ddeddb38"}},
        {mochiweb,".*",
                  {git,"git://github.com/basho/mochiweb",
                       "9090c7942f9dcde4ddbf9f78429e289ff5600c18"}},
@@ -54,7 +54,7 @@
                        "3eadabe05bddbffe9e3d5cf17a9384319d8756a1"}},
        {uuid,".*",
              {git,"https://github.com/okeuday/uuid.git",
-                  "f154016f3a73075f7cf3f05be01edeea93564367"}},
+                  "04a3037c492d2331dd7193c465868c1d71b28363"}},
        {pooler,".*",
                {git,"https://github.com/seth/pooler.git",
                     "6a12e4419c8fe504c77cd6393bcc11cb8993aa24"}},
@@ -63,7 +63,7 @@
                    "16021593c866ca314acd0ba6858194ed44a362b3"}},
        {katja,".*",
               {git,"git://github.com/nifoc/katja.git",
-                   "4047734b35eb8b4f6f705f4899c6d94ed3c81e4d"}},
+                   "ec7f78b85ec36570e528d21ed54038d74141f1ea"}},
        {rebar_lock_deps_plugin,".*",
                                {git,"git://github.com/seth/rebar_lock_deps_plugin.git",
                                     "9711549b8a84b065eb2edc22f8eb6ff85e3c94e8"}}]}.