Merge pull request #955 from martinsumner/develop-2.9

Update Release 2.9 Series - Overview.md
basho · Feb 27, 2019 · a80de91 · a80de91
2 parents 4d86728 + a839b86
commit a80de91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/doc/Release 2.9 Series - Overview.md b/doc/Release 2.9 Series - Overview.md
@@ -183,7 +183,7 @@ These features are:
 
 ### Release 3.0
 
-Work on Release 3.0 will initially focus entirely on ensuring the OTP uplift is completed, so that Riak can be run on OTP 20 (and preferably also OTP 21).  As part of doing this, under-used features may be removed if insufficient community interest and time is available to maintain them - this may impact the availability of Yokozuna and riak_ensemble beyond Riak 2.9.  It requires significant work to maintain features through new releases, and reducing accidental complexity is an important goal for the Riak community to ensure we can in the future continue to safely manage the codebase.
+Work on Release 3.0 will initially focus entirely on ensuring the OTP uplift is completed, so that Riak can be run on OTP 20 (and preferably also OTP 21).  As part of doing this, under-used features may be removed if insufficient community interest and time is available to maintain them.  This is likely to impact the availability of riak_ensemble beyond Riak 2.9, but it is now expected that sufficient community effort will be available to sustain support for Yokozuna.  It requires significant work to maintain features through new releases, and reducing accidental complexity is an important goal for the Riak community to ensure we can in the future continue to safely manage the codebase.
 
 The initial release of 3.0 is unlikely to contain further features beyond that of the OTP uplift.  However, there are some areas of feature growth expected within the Riak 3.0 release cycle:
 

diff --git a/rebar.config.lock b/rebar.config.lock
@@ -107,8 +107,8 @@
             {git,"https://github.com/szktty/erlang-lz4",
                  "6bc5efe93bab327788bcde24374f16044b549dd8"}},
        {leveled,".*",
-                {git,"https://github.com/martinsumner/leveled",
-                     "aea20de4b9db75351a1ad9ceaa65559779de86c9"}},
+                {git,"https://github.com/martinsumner/leveled.git",
+                     "08d071dce84dc462a263e0328264758be87d3c12"}},
        {kv_index_tictactree,".*",
                             {git,"https://github.com/martinsumner/kv_index_tictactree.git",
                                  "4c392e4a6ecfacf0c5bf8c0949416d1887db1e52"}},
@@ -121,9 +121,6 @@
        {riak_pb,".*",
                 {git,"git://github.com/basho/riak_pb.git",
                      "21104a0ab37d1300d7a03dfaab4663f5db0d812d"}},
-       {ibrowse,".*",
-                {git,"git://github.com/cmullaparthi/ibrowse.git",
-                     "e8ae353c16d4f0897abb9f80025b52925b974dd1"}},
        {mochiweb,".*",
                  {git,"git://github.com/basho/mochiweb.git",
                       "d606cb0d884de473442ca86eea57331b929f9b96"}},
@@ -144,7 +141,7 @@
                    "fdb62672000be1477e2c8b6d02289abe411baf91"}},
        {riak_kv,".*",
                 {git,"git://github.com/basho/riak_kv.git",
-                     "85db113ce99d540af76ddd42d043a24cb14f548f"}},
+                     "176c9ee3cc18a0e10c4b047eea3887dccc159acd"}},
        {erlydtl,".*",
                 {git,"git://github.com/erlydtl/erlydtl.git",
                      "d20b53f04837a1053ed18987f645cb60eae82453"}},
@@ -175,6 +172,9 @@
        {kvc,".*",
             {git,"git://github.com/etrepum/kvc.git",
                  "5565fe51857747662410cc3c06362ebcf48a2f04"}},
+       {ibrowse,".*",
+                {git,"git://github.com/cmullaparthi/ibrowse.git",
+                     "e8ae353c16d4f0897abb9f80025b52925b974dd1"}},
        {fuse,".*",
              {git,"https://github.com/jlouis/fuse.git",
                   "21c6e52ced3af294f2fe636039106068da12eeeb"}},
@@ -188,3 +188,4 @@
                                {git,"https://github.com/basho/rebar_lock_deps_plugin.git",
                                     "8816f45ff38cd04d5c7741bd39166af58116dd44"}}]}.
 {plugins,[rebar_lock_deps_plugin]}.
+