Merge remote-tracking branch 'origin/2.0' into develop-2.0-merge

Conflicts: rebar.config Updates: doesn't use lock-deps for `make rel` as in 2.0 branch
basho · Mar 19, 2015 · 423e9e1 · 423e9e1
2 parents 963ef3a + b9b5c7d
commit 423e9e1
Show file tree

Hide file tree

Showing 8 changed files with 1,116 additions and 113 deletions.
diff --git a/Makefile b/Makefile
@@ -6,6 +6,12 @@ ERLANG_BIN       = $(shell dirname $(shell which erl))
 REBAR           ?= $(BASE_DIR)/rebar
 OVERLAY_VARS    ?=
 
+RIAK_CORE_STAT_PREFIX = riak
+export RIAK_CORE_STAT_PREFIX
+
+EXOMETER_PACKAGES = "(basic)"
+export EXOMETER_PACKAGES
+
 $(if $(ERLANG_BIN),,$(warning "Warning: No Erlang found in your path, this will probably not work"))
 
 .PHONY: rel stagedevrel deps

diff --git a/RELEASE-NOTES.ja.md b/RELEASE-NOTES.ja.md
@@ -1,3 +1,30 @@
+# Riak 2.0.1 リリースノート
+
+## クライアント証明書による認証
+
+先日リリースされた2.0以降、Riakでは認証と認可の機能が利用できるようになりました。
+
+2.0.0では誤ったクライアント証明書が受け付けられていましたが、
+この問題は2.0.1で修正されました。
+
+#### マージ済PR
+
+* bitcask/186: [Bugfix/key transform crash](https://github.com/basho/bitcask/pull/186)
+* bitcask/189: [Refresh efile port if gone](https://github.com/basho/bitcask/pull/189)
+* bitcask/190: [Fix scan error deadlock](https://github.com/basho/bitcask/pull/190)
+* bitcask/192: [Fix remove expired on read race](https://github.com/basho/bitcask/pull/192)
+* bitcask/197: [Fix extra tombstones on update](https://github.com/basho/bitcask/pull/197)
+* bitcask/198: [Fix race listing readable files](https://github.com/basho/bitcask/pull/198)
+* riak_kv/1008: [Use SC bucket types and buckets to know ensembles](https://github.com/basho/riak_kv/pull/1008)
+* riak_kv/1026: [Update to use new breadth-first AAE exchange](https://github.com/basho/riak_kv/pull/1026)
+* riak_core/626: [Allow handoff sender to abort handoff by throw'ing from fold fun](https://github.com/basho/riak_core/pull/626)
+* riak_core/627: [Handoff sender sends sync periodically](https://github.com/basho/riak_core/pull/627)
+* riak_core/629: [Add breadth-first AAE exchange](https://github.com/basho/riak_core/pull/629)
+* riak_api/66: [Do not treat errors as success](https://github.com/basho/riak_api/pull/66)
+* riak_repl/618: [Added a worker pool for fullsync sinks.](https://github.com/basho/riak_repl/pull/618)
+* riak_repl/619: [Small user experience fixes.](https://github.com/basho/riak_repl/pull/619)
+* riak_repl/620: [Improved AAE fullsync integration/2.0 pull request](https://github.com/basho/riak_repl/pull/620)
+
 # Riak 2.0.0 リリースノート
 
 ## 2.0の主な機能と改善

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
diff --git a/rebar.config.lock b/rebar.config.lock
@@ -1,15 +1,18 @@
 %% THIS FILE IS GENERATED. DO NOT EDIT IT MANUALLY %%
 
 {sub_dirs,["rel","apps/riak"]}.
-{require_otp_vsn,"R16"}.
+{require_otp_vsn,"R16|17"}.
 {cover_enabled,true}.
 {lib_dirs,["apps/riak"]}.
 {erl_opts,[debug_info,fail_on_warning]}.
 {eunit_opts,[verbose]}.
 {erlydtl_opts,[{compiler_options,[report,return,debug_info]}]}.
-{deps,[{node_package,".*",
+{deps,[{rebar_lock_deps_plugin,".*",
+                               {git,"git://github.com/seth/rebar_lock_deps_plugin.git",
+                                    "7a5835029c42b8138325405237ea7e8516a84800"}},
+       {node_package,".*",
                      {git,"git://github.com/basho/node_package.git",
-                          "a56fe9b021e3543a24fdfc98f1c16704b41e62c6"}},
+                          "a829631eccebe3c1d7657a0075584f55bf342977"}},
        {goldrush,".*",
                  {git,"git://github.com/DeadZen/goldrush.git",
                       "71e63212f12c25827e0c1b4198d37d5d018a7fec"}},
@@ -24,7 +27,7 @@
                           "fa2e7e3daee0d0a59dadb820fd3381eac4a65770"}},
        {cluster_info,".*",
                      {git,"git://github.com/basho/cluster_info.git",
-                          "1fae829ea639c8fcfeeb080aad02da01ff49b218"}},
+                          "e231144ca32dc83317be3360a4a259c73826b08a"}},
        {sidejob,".*",
                 {git,"git://github.com/basho/sidejob.git",
                      "c5aabba2d7daa80c340e110902bbcfcb552ccdcf"}},
@@ -33,7 +36,7 @@
                        "07467d899ab90a2b719ad19ab0be0048c1c8d873"}},
        {meck,".*",
              {git,"git://github.com/basho/meck.git",
-                  "2b25a30a8688f94106d07f23a9f1fb523ac00f08"}},
+                  "dde759050eff19a1a80fd854d7375174b191665d"}},
        {getopt,".*",
                {git,"git://github.com/jcomellas/getopt.git",
                     "659a28f4145bc9843598972854299dc4ea77e4cb"}},
@@ -42,105 +45,114 @@
                      "760928ec8870da02eb11bccb501e2700925d06c6"}},
        {cuttlefish,".*",
                    {git,"git://github.com/basho/cuttlefish.git",
-                        "b2ce0b15687f97259031f9f42e25ae52cdee3bab"}},
+                        "c92c8325aeaea6b6ba7516bbd434f8e408f87d60"}},
        {bitcask,".*",
                 {git,"git://github.com/basho/bitcask.git",
-                     "f813d093053a1c14795764eb78606f1c18df98ef"}},
+                     "c74d0c43fdefdd435f7621ddf1fc2995b5bd123c"}},
        {eper,".*",
              {git,"git://github.com/basho/eper.git",
                   "7222ecaebceb5422e74a9c1503043bbc6036f6b7"}},
        {edown,".*",
-              {git,"git://github.com/esl/edown.git",
-                   "4cb4ad67382590d92228ea6c56225376bd9f5685"}},
+              {git,"git://github.com/uwiger/edown.git",
+                   "d62ec85281e451a46ba30045917c119d65b72a84"}},
        {sext,".*",
              {git,"git://github.com/basho/sext.git",
-                  "f53f1bd37c29e45dc788a5d8b4512c66511d4cb5"}},
+                  "846b9cc22456287a572efd4c924203d77778670f"}},
        {poolboy,".*",
                 {git,"git://github.com/basho/poolboy.git",
-                     "84d836ab49da618d1e3fb3947207bf9b7fcea335"}},
+                     "8bb45fbc715c5f493642a1cc572ec7017d0d5fa3"}},
        {basho_stats,".*",
                     {git,"git://github.com/basho/basho_stats.git",
                          "19c532af235ae675439d491b329c55c2f9b02deb"}},
        {riak_sysmon,".*",
                     {git,"git://github.com/basho/riak_sysmon.git",
-                         "8362bc1046c8f5c749b1f6e61eb9571b0d5a5f47"}},
-       {bear,".*",
-             {git,"git://github.com/basho/bear.git",
-                  "da820a13c607c3f816ee8b83c587266da5389761"}},
-       {folsom,".*",
-               {git,"git://github.com/basho/folsom.git",
-                    "e80bd013c8ea906c4f14cba38b92e95116415e23"}},
+                         "26a58bcaba96d07df885f7b3db4d4306f995ce14"}},
        {eleveldb,".*",
                  {git,"git://github.com/basho/eleveldb.git",
-                      "2c9c5a5f66255266145154bb3ca975087f2a308f"}},
+                      "0e4e4e7cf3ddc26523a77f853ea9409c1707b26c"}},
        {riak_ensemble,".*",
                       {git,"git://github.com/basho/riak_ensemble",
-                           "e0652c64cda9355dc429f4a4c3747c5fdf017722"}},
+                           "78dc8f623353a212ca3cf12236d1e9ac824bde16"}},
        {pbkdf2,".*",
                {git,"git://github.com/basho/erlang-pbkdf2.git",
                     "7076584f5377e98600a7e2cb81980b2992fb2f71"}},
+       {parse_trans,".*",
+                    {git,"git://github.com/uwiger/parse_trans.git",
+                         "82cc00264aa1bad8fc5c0739b7541feb4a843432"}},
+       {bear,".*",
+             {git,"git://github.com/basho/bear.git",
+                  "da820a13c607c3f816ee8b83c587266da5389761"}},
+       {folsom,".*",
+               {git,"git://github.com/basho/folsom.git",
+                    "72944523b6467c9f7add5f1c96dd5020424a2681"}},
+       {setup,".*",
+              {git,"git://github.com/uwiger/setup.git",
+                   "51ee7c9f64d2bbe9dcbb58c278e8fbfd4d0ca5e2"}},
+       {exometer_core,".*",
+                      {git,"git://github.com/basho/exometer_core.git",
+                           "b47a5d65d9500c2b8f6ccc50e34005503589ef77"}},
+       {clique,".*",
+               {git,"git://github.com/basho/clique.git",
+                    "3af4db8ea0f74aca42f6713446dcd5915c795a74"}},
        {riak_core,".*",
                   {git,"git://github.com/basho/riak_core.git",
-                       "ffd5d8a1a811d5649675049fdb9e42d7a419f5be"}},
+                       "044c4e7f8dbfe8c49c45f2f7090adff4cd5aba50"}},
        {riak_pipe,".*",
                   {git,"git://github.com/basho/riak_pipe.git",
-                       "29c6bec7a1d376bf78b4069308c5518cb6ee49fd"}},
+                       "3c0abc7ba301d57940c5a9c5de368b70429c28ff"}},
        {protobuffs,".*",
                    {git,"git://github.com/basho/erlang_protobuffs.git",
-                        "5257dfe4e000b58487af89b849c7336ffa9bae82"}},
+                        "f88fc3c6881687432ddd5546b3c7b08009dfb26f"}},
        {riak_pb,".*",
                 {git,"git://github.com/basho/riak_pb.git",
-                     "fc18a9b37170431f659e08d66ed78e3f6bbc47ca"}},
+                     "78c50efa698f33f7d6ab1c7f5fa4666ec03b46b4"}},
        {mochiweb,".*",
                  {git,"git://github.com/basho/mochiweb.git",
-                      "5e6e3e688dc9987a97e261431256e29671555c0b"}},
-       {ibrowse,".*",
-                {git,"git://github.com/cmullaparthi/ibrowse.git",
-                     "9b8b042fb7d37b90994ef6b6615c92dd2769328e"}},
+                      "ade2a9b29a11034eb550c1d79b4f991bf5ca05ba"}},
        {webmachine,".*",
                    {git,"git://github.com/basho/webmachine.git",
-                        "e5f82336bb7a4552dd33e02bf8f66e67547f13be"}},
+                        "7677c240f4a7ed020f4bab48278224966bb42311"}},
        {riak_api,".*",
                  {git,"git://github.com/basho/riak_api.git",
-                      "cc98fff03a117a5c996a08557d510723f619b415"}},
+                      "2781e66796903bc6847bffcf71a6ba7a05d69275"}},
        {riak_dt,".*",
                 {git,"git://github.com/basho/riak_dt.git",
-                     "c06820d95d2ee88dfc4db6c459d2f3739c204ed2"}},
+                     "f7981d4ad7407ddc085f133f204dd71bf9d50c56"}},
        {eunit_formatters,".*",
                          {git,"git://github.com/seancribbs/eunit_formatters",
-                              "dab4291d191f0ca40c911179fd195c3942261667"}},
+                              "96b6ced4d45ba641cbf2c8a8ae9b350dd300bc10"}},
        {riak_kv,".*",
                 {git,"git://github.com/basho/riak_kv.git",
-                     "fb63e7a812664ccac488c9abb36cbfc868a36339"}},
+                     "404619cb57574cd43e2dc0dc0453884ec6732a99"}},
        {merge_index,".*",
                     {git,"git://github.com/basho/merge_index.git",
                          "b701dde5c28956c3b629411e5ff7e50cbb5cb4b3"}},
        {riak_search,".*",
                     {git,"git://github.com/basho/riak_search.git",
-                         "adac3e462230b5560b827057199effaaace9b694"}},
+                         "8fe4a8c020a74c52ee877bf6dd410824b4f79f8b"}},
        {erlydtl,".*",
                 {git,"git://github.com/evanmiller/erlydtl.git",
                      "d20b53f04837a1053ed18987f645cb60eae82453"}},
        {riak_control,".*",
                      {git,"git://github.com/basho/riak_control.git",
-                          "5ab3896d8ca96b19512cf6aee2d685cdc6ab0432"}},
+                          "09073ce672260e1ec0ba3999fabed7f319624ba1"}},
        {riaknostic,".*",
                    {git,"git://github.com/basho/riaknostic.git",
-                        "4e7daa5c27cc6bd8cfb4a1c5f19a6e8ac2a8e344"}},
+                        "101d95bddff4b70afcd1dd5442b8c6651887e0a4"}},
        {kvc,".*",
             {git,"git://github.com/etrepum/kvc.git",
-                 "75c4e76468cb2bd03067a9c349989ee914a1b581"}},
+                 "5565fe51857747662410cc3c06362ebcf48a2f04"}},
+       {ibrowse,".*",
+                {git,"git://github.com/cmullaparthi/ibrowse.git",
+                     "e8ae353c16d4f0897abb9f80025b52925b974dd1"}},
        {yokozuna,".*",
                  {git,"git://github.com/basho/yokozuna.git",
-                      "eb4919ce833e0063d24113e41a2d9ea79aa9756f"}},
+                      "5868266b11f131d14c85495e50f899f3fe8158ba"}},
        {canola,".*",
                {git,"git://github.com/basho/canola.git",
                     "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},
        {riak_auth_mods,".*",
                        {git,"git://github.com/basho/riak_auth_mods.git",
-                            "6fece8fa2ad5abede54edb9bd62a847e1956019a"}},
-       {rebar_lock_deps_plugin,".*",
-                               {git,"git://github.com/seth/rebar_lock_deps_plugin.git",
-                                    "9711549b8a84b065eb2edc22f8eb6ff85e3c94e8"}}]}.
+                            "31b8b30e6c215418522eaa615264ae9769a87410"}}]}.
 {plugins,[rebar_lock_deps_plugin]}.