Merge pull request #963 from martinsumner/develop-2.9

Tidy make test on OSX

doc/Release 2.9 Series - Overview.md

@@ -153,6 +153,10 @@ The primary RC5 change is again leveled related.  It was discovered in handoff s
 
 There is also a small fix to poolboy to prevent a crash log from appearing on shutdown.
 
+#### Release 2.9.0 RC6
+
+RC6 fixes some security issues within yokozuna, and completes a full run through of the yokozuna tests.  It resolves an issue with HTTP security features crashing Riak which was introduced as part of the RC2 mochiweb uplift to fix the 2i index changes.  It also transitions the eleveldb branch used to point back to the `basho` repository, with a fix that allows eleveldb to be deployed on recent OSX versions.  An OSX-specific issue with `make test` failing on `eper` and `riak_ensemble` unit tests is also resolved.
+
 #### Transition Configuration Guidance
 
 This section contains some initial notes to assist with planning and configuration for Transition of pre-2.9 releases to 2.9:

rebar.config.lock

@@ -69,7 +69,7 @@
                       "72f28a1f1b8afd0ed819985ca2f06ebf0e1ed8cc"}},
        {riak_ensemble,".*",
                       {git,"https://github.com/basho/riak_ensemble",
-                           "fc02cd3210128d4d40d4197210f278caeb9e8c5f"}},
+                           "c50bf6d3315dbc6ec7d9d4a24e25cc831e688716"}},
        {pbkdf2,".*",
                {git,"git://github.com/basho/erlang-pbkdf2.git",
                     "7dfc96e4acdc4fba7893db7859130f4650bcec9e"}},
@@ -93,7 +93,7 @@
                     "baed0a08165d08e7c6e363996e1fc3e5bef8e0cf"}},
        {riak_core,".*",
                   {git,"https://github.com/basho/riak_core.git",
-                       "8123ac5ce9c5efa1b1fbc521e2ad524e12ff2c99"}},
+                       "4443cfccf9b33449cc85f79ca0abc856db27504d"}},
        {riak_pipe,".*",
                   {git,"git://github.com/basho/riak_pipe.git",
                        "24c3064aafe26065a57491ee43ef4f3569fafb8c"}},