Roll riak version 2.0.0pre2

basho · Sep 23, 2013 · 263da73 · 263da73
1 parent cc30c4a
commit 263da73
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 18 deletions.
diff --git a/rebar.config.lock b/rebar.config.lock
@@ -14,13 +14,13 @@
                   "da820a13c607c3f816ee8b83c587266da5389761"}},
        {bitcask,".*",
                 {git,"git://github.com/basho/bitcask",
-                     "60b5d87ce4c9ba7759ac08cad76b3d7264604419"}},
+                     "e8d05019c56bc28533c317e6695744bac651bd51"}},
        {cluster_info,".*",
                      {git,"git://github.com/basho/cluster_info",
                           "c234bba9d0d8ae5c23fb3af055ec3387ed3b04f7"}},
        {cuttlefish,".*",
                    {git,"git://github.com/basho/cuttlefish",
-                        "60be6f2d61dc72de9b8113b4096db9d595e7b535"}},
+                        "09a1aa933757b8aa0f4956dbf4361c863353df77"}},
        {ebloom,".*",
                {git,"git://github.com/basho/ebloom",
                     "0b6d7d9ee8d2b42f08d24d149d64848734c21121"}},
@@ -29,7 +29,7 @@
                    "1f6954ce8f313139385110f68c18c17adb2723f8"}},
        {eleveldb,".*",
                  {git,"git://github.com/basho/eleveldb.git",
-                      "2f6f520cb9a84a7507675540275582f58d59e1cf"}},
+                      "d3809d7434489f37a6f7686ee3423d6e9e79a397"}},
        {eper,".*",
              {git,"git://github.com/basho/eper.git",
                   "7f94808f958e810b477e096a4960ee90ea9c0f4b"}},
@@ -41,7 +41,7 @@
                      "d20b53f04837a1053ed18987f645cb60eae82453"}},
        {folsom,".*",
                {git,"git://github.com/basho/folsom.git",
-                    "3dde1a33578877977e70dc88363e89c4b0e0ab57"}},
+                    "f93db4e9119d49b51e9533b5a78df5997d47e5b6"}},
        {getopt,".*",
                {git,"git://github.com/jcomellas/getopt",
                     "69b51ebf337f41906045a606a151d9578751e1ff"}},
@@ -61,8 +61,8 @@
                      {git,"git://github.com/basho/lager_syslog",
                           "498bd2a70cf8a1876d5d49b7d06fd986ba8498eb"}},
        {meck,".*",
-             {git,"https://github.com/eproxus/meck",
-                  "8433cf2e07862ea8c66e85e2578b7146b4332354"}},
+             {git,"git://github.com/basho/meck.git",
+                  "2b25a30a8688f94106d07f23a9f1fb523ac00f08"}},
        {merge_index,".*",
                     {git,"git://github.com/basho/merge_index",
                          "8992d90c1c5cc0d024b4c92d1e6c4cba03e07e91"}},
@@ -74,13 +74,16 @@
                      "2ef28a45d800e8ef5ce46890d92daa06f48c6c27"}},
        {node_package,".*",
                      {git,"git://github.com/basho/node_package",
-                          "203ca12e8802bdea690b342ca76bbe58f2f1a6a2"}},
+                          "2bb69676a3bce3657585437cf8d26b94c1946dd7"}},
+       {pbkdf2,".*",
+               {git,"git://github.com/basho/erlang-pbkdf2",
+                    "35a82f19de352b2d42ed307fb470c893d0e9d6ad"}},
        {poolboy,".*",
                 {git,"git://github.com/basho/poolboy",
                      "82511c5e9949f10a5520c37b00c225445ba9a701"}},
        {protobuffs,".*",
                    {git,"git://github.com/basho/erlang_protobuffs",
-                        "ec7e99f57f5bbcd91c56242091485d41bc78c3d4"}},
+                        "0b00f9031cda5ffe83a3d183e14f2dc918bc2932"}},
        {ranch,".*",
               {git,"git://github.com/basho/ranch.git",
                    "3f70e09efe992bbe1989d40812eded936cd2a0e1"}},
@@ -89,19 +92,22 @@
                                     "758d1cf4cc79483e1fbaf2ea59ed9e9f76b4a012"}},
        {riak_api,".*",
                  {git,"git://github.com/basho/riak_api.git",
-                      "1dfbacf83c6eb6f4b5511887731dc443b62aae08"}},
+                      "07b00b1b957990a62a7b81ba1639783a23528f10"}},
        {riak_control,".*",
                      {git,"git://github.com/basho/riak_control",
-                          "d44979710c87d2785429facd44b21ea46ac459e6"}},
+                          "f68ce0f539f208dc91d30dcd0acae76e1a817b64"}},
        {riak_core,".*",
                   {git,"git://github.com/basho/riak_core",
-                       "a5bec2721ee0daff6c1bfe5efcdacdb53f922b6a"}},
+                       "288bf4951ae133ca11a6e26c99f42aa15cc67cb7"}},
+       {riak_dt,".*",
+                {git,"git://github.com/basho/riak_dt.git",
+                     "fda006b5d591afeb371a746d13a5ed47cc487c57"}},
        {riak_kv,".*",
                 {git,"git://github.com/basho/riak_kv",
-                     "a2621d81e01e1cc27aad8825c776c536d0a85b99"}},
+                     "3d455b7ca605ea77f3da9a91cf858310d9e96785"}},
        {riak_pb,".*",
                 {git,"git://github.com/basho/riak_pb.git",
-                     "2c015bd4ca407457bf33a2a174bf48564f73c989"}},
+                     "2adf207d053738559811eb17f62f7ce6b6f5cc95"}},
        {riak_pipe,".*",
                   {git,"git://github.com/basho/riak_pipe.git",
                        "64e391816ee94c63c91d109001b0255177c6fa13"}},
@@ -113,7 +119,7 @@
                          "abe744c76688bd59527130e150c2cf82f211f5c2"}},
        {riaknostic,".*",
                    {git,"git://github.com/basho/riaknostic",
-                        "1472545584d2f99569125c2ee99dc6ae83920ece"}},
+                        "0089dcf3f76d457d1b0c75a9d5f3955bcceaeb78"}},
        {sext,".*",
              {git,"git://github.com/uwiger/sext",
                   "3af54780327d02f5907c732be588e342bc876691"}},
@@ -124,10 +130,10 @@
                {git,"git://github.com/Vagabond/erlang-syslog",
                     "a67e9b6e61398f23917f1c1de2c0cc9728b1f172"}},
        {webmachine,".*",
-                   {git,"git://github.com/basho/webmachine",
-                        "a16996309aff904ba01f60a73de1d88063292b02"}},
+                   {git,"git://github.com/basho/webmachine.git",
+                        "9cd03ae697628b1e5a24b05cf24ad4ac8329f6e0"}},
        {yokozuna,".*",
                  {git,"git://github.com/basho/yokozuna",
-                      "8c4092446ff9939b0315fe2f824b1fb8c9290cd9"}}]}.
+                      "e5c4c3e53307c23e0c75fb1d611e17b983c6e5dd"}}]}.
 {plugins,[cuttlefish_rebar_plugin,rebar_lock_deps_plugin]}.
 
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.0.0pre1",
+       {rel, "riak", "2.0.0pre2",
         [
          kernel,
          stdlib,