From 384abac0ab5fe415627b93e4100bc834a4769654 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Thu, 21 Jun 2018 21:26:59 +0400
Subject: [PATCH 01/31] missed case in mapdeps.erl

---
 misc/mapdeps.erl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/misc/mapdeps.erl b/misc/mapdeps.erl
index abe18c915..e7ea6c4d1 100755
--- a/misc/mapdeps.erl
+++ b/misc/mapdeps.erl
@@ -85,9 +85,12 @@ map_rebar(BaseDir, Path, Acc) ->
         {ok, Opts} ->
             Deps = proplists:get_value(deps, Opts, []),
             lists:foldl(
-              fun({DepName, _, {_,_,V}  }, A) ->
+              fun({DepName, _, Info}, A) ->
+                      VerStr = case Info of
+                                   {_,_,V} -> ver(V);
+                                   {_,_V}   -> "HEAD"
+                               end,
                       From = app_name(Path),
-                      VerStr = ver(V),
                       To = {atom_to_list(DepName), VerStr},
                       case ordsets:is_element({To, From}, A) of
                           true ->

From 60d2e8308393b23ac0de305aef9dbb4d2c6e7760 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Thu, 21 Jun 2018 21:37:08 +0400
Subject: [PATCH 02/31] =?UTF-8?q?yokozuna=20=E2=87=92=20Sentenai/yokozuna?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rebar.config      | 22 +++++++++++-----------
 rebar.config.lock |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/rebar.config b/rebar.config
index f8d93f262..3d83f3a0f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -14,16 +14,16 @@
                ]}.
 
 {deps, [
-        {node_package, ".*", {git, "https://github.com/basho/node_package.git", {tag, "4.0.2"}}},
-        {lager_syslog, ".*", {git, "git://github.com/basho/lager_syslog.git", {tag, "3.0.3"}}},
-        {cluster_info, ".*", {git, "git://github.com/basho/cluster_info.git", {tag, "2.0.5"}}},
-        {riak_kv, ".*", {git, "git://github.com/basho/riak_kv.git", {tag, "2.1.7-226"}}},
-        {riak_control, ".*", {git, "git://github.com/basho/riak_control.git", {tag, "2.1.6-225"}}},
-        {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
-        {yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {tag, "2.1.10-226"}}},
-        {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
-        {riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "2.1.8-226"}}},
-        {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
-       ]}.
+ {node_package,           ".*", {git, "https://github.com/basho/node_package.git",           {tag,    "4.0.2"}}},
+ {lager_syslog,           ".*", {git, "git://github.com/basho/lager_syslog.git",             {tag,    "3.0.3"}}},
+ {cluster_info,           ".*", {git, "git://github.com/basho/cluster_info.git",             {tag,    "2.0.5"}}},
+ {riak_kv,                ".*", {git, "git://github.com/basho/riak_kv.git",                  {tag,    "2.1.7-226"}}},
+ {riak_control,           ".*", {git, "git://github.com/basho/riak_control.git",             {tag,    "2.1.6-225"}}},
+ {riaknostic,             ".*", {git, "git://github.com/basho/riaknostic.git",               {tag,    "2.1.7"}}},
+ {yokozuna,               ".*", {git, "https://github.com/Sentenai/yokozuna.git",            {branch, "fresh-solr"}}},
+ {riak_auth_mods,         ".*", {git, "git://github.com/basho/riak_auth_mods.git",           {tag,    "2.1.0"}}},
+ {riak_repl,              ".*", {git, "git://github.com/basho/riak_repl.git",                {tag,    "2.1.8-226"}}},
+ {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag,    "3.1.0p1"}}}
+]}.
 
 {plugins, [rebar_lock_deps_plugin]}.
diff --git a/rebar.config.lock b/rebar.config.lock
index 02f827962..32273b5c7 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -155,8 +155,8 @@
               {git,"git://github.com/basho/riak-erlang-client",
                    "ab91dfc11a6bcda0966eb662e9c6e5875ecfc3dc"}},
        {yokozuna,".*",
-                 {git,"git://github.com/basho/yokozuna.git",
-                      "a14d4001bf6011d0cfec46c67abbd96f651f65de"}},
+                 {git,"https://github.com/Sentenai/yokozuna.git",
+                      "f53313645bb79ae3331406f0f706899ff0316b0a"}},
        {canola,".*",
                {git,"git://github.com/basho/canola.git",
                     "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},

From 846e32e66e0902f15b000a4b16b26e67839f4d5c Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Mon, 9 Jul 2018 22:40:08 +0400
Subject: [PATCH 03/31] =?UTF-8?q?yokozuna=20=E2=87=92=20Jul=209=20version?=
 =?UTF-8?q?=20(preliminary=20EntropyClient)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rebar.config.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config.lock b/rebar.config.lock
index 32273b5c7..c6445170c 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -156,7 +156,7 @@
                    "ab91dfc11a6bcda0966eb662e9c6e5875ecfc3dc"}},
        {yokozuna,".*",
                  {git,"https://github.com/Sentenai/yokozuna.git",
-                      "f53313645bb79ae3331406f0f706899ff0316b0a"}},
+                      "1843107e6568c4f34df262f7e8746242fbd7d920"}},
        {canola,".*",
                {git,"git://github.com/basho/canola.git",
                     "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},

From bfecb5851abfa7b4d0b9e5b21b2c2d2cbe69870a Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Tue, 10 Jul 2018 22:07:30 +0400
Subject: [PATCH 04/31] =?UTF-8?q?yoko=20=E2=87=92=20Jul=2010=20(tooling)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rebar.config.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config.lock b/rebar.config.lock
index c6445170c..7c0842b99 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -156,7 +156,7 @@
                    "ab91dfc11a6bcda0966eb662e9c6e5875ecfc3dc"}},
        {yokozuna,".*",
                  {git,"https://github.com/Sentenai/yokozuna.git",
-                      "1843107e6568c4f34df262f7e8746242fbd7d920"}},
+                      "119e30fbf4aff3f695f1ac622be34c3beec27b10"}},
        {canola,".*",
                {git,"git://github.com/basho/canola.git",
                     "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},

From 1686693ed3fd4d01b2f91dcefadd1c73bcba3509 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Fri, 20 Jul 2018 17:34:12 +0400
Subject: [PATCH 05/31] copy forgotten riak_repl.schema too

---
 rel/reltool.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rel/reltool.config b/rel/reltool.config
index ec78a3a03..5ef9783a4 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -120,6 +120,7 @@
            {template, "../deps/riak_kv/priv/multi_backend.schema", "lib/20-multi_backend.schema"},
            {template, "../deps/eleveldb/priv/eleveldb.schema", "lib/21-leveldb.schema"},
            {template, "../deps/eleveldb/priv/eleveldb_multi.schema", "lib/22-leveldb_multi.schema"},
+           {template, "../deps/riak_repl/priv/riak_repl.schema", "lib/23-riak_repl.schema"},
            {template, "../deps/yokozuna/priv/yokozuna.schema", "lib/30-yokozuna.schema"},
 
            {template, "files/advanced.config", "etc/advanced.config"},

From d5ba4133ae99556d23f8b091b7fdae2230034876 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Fri, 20 Jul 2018 17:34:32 +0400
Subject: [PATCH 06/31] =?UTF-8?q?=E2=80=9Cbump=E2=80=9D=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile           | 2 +-
 rel/reltool.config | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index e2f87929c..69257b4f4 100644
--- a/Makefile
+++ b/Makefile
@@ -256,7 +256,7 @@ NAME_HASH = $(shell git hash-object distdir/$(CLONEDIR)/$(MANIFEST_FILE) 2>/dev/
 ifeq ($(REVISION), $(MAJOR_VERSION))
 PKG_ID := $(REPO_TAG)
 else
-PKG_ID = $(REPO)-$(MAJOR_VERSION)-$(NAME_HASH)
+PKG_ID = $(REPO)-$(MAJOR_VERSION)-sentenai-$(NAME_HASH)
 endif
 
 # To ensure a clean build, copy the CLONEDIR at a specific tag to a new directory
diff --git a/rel/reltool.config b/rel/reltool.config
index 5ef9783a4..b63ff88a9 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -2,7 +2,7 @@
 %% ex: ft=erlang ts=4 sw=4 et
 {sys, [
        {lib_dirs, ["../deps"]},
-       {rel, "riak", "2.2.5",
+       {rel, "riak", "2.2.6-sentenai",
         [
          kernel,
          stdlib,

From c93630e85fd2ac079ef19854eca4c4324e1f2a4e Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Tue, 24 Jul 2018 14:42:31 +0400
Subject: [PATCH 07/31] rebar.config small fixes: xref, plugin_dir

---
 rebar.config | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/rebar.config b/rebar.config
index 3d83f3a0f..ae48192bf 100644
--- a/rebar.config
+++ b/rebar.config
@@ -4,6 +4,8 @@
 {require_otp_vsn, "R16|17"}.
 {cover_enabled, true}.
 
+{recursive_cmds, [xref]}.
+
 {lib_dirs, ["apps/riak"]}.
 
 {erl_opts, [debug_info, fail_on_warning]}.
@@ -26,4 +28,8 @@
  {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag,    "3.1.0p1"}}}
 ]}.
 
-{plugins, [rebar_lock_deps_plugin]}.
+{plugin_dir, "deps"}.
+{plugins, [
+  rebar_lock_deps_plugin
+]}.
+

From 72d52883d841a50651fb22b04136d8dd6d446d6a Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Wed, 25 Jul 2018 02:45:18 +0400
Subject: [PATCH 08/31] =?UTF-8?q?yokozuna=20=E2=86=92=20=E2=80=9Cbump?=
 =?UTF-8?q?=E2=80=9D=20version=20@Fri=20Jul=2020?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rebar.config.lock | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rebar.config.lock b/rebar.config.lock
index 7c0842b99..3cdbbafd1 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -3,6 +3,7 @@
 {sub_dirs,["rel","apps/riak"]}.
 {require_otp_vsn,"R16|17"}.
 {cover_enabled,true}.
+{recursive_cmds,[xref]}.
 {lib_dirs,["apps/riak"]}.
 {erl_opts,[debug_info,fail_on_warning]}.
 {eunit_opts,[verbose]}.
@@ -156,7 +157,7 @@
                    "ab91dfc11a6bcda0966eb662e9c6e5875ecfc3dc"}},
        {yokozuna,".*",
                  {git,"https://github.com/Sentenai/yokozuna.git",
-                      "119e30fbf4aff3f695f1ac622be34c3beec27b10"}},
+                      "6c789d7165421adee732f6bf5c78df8d47dc44c3"}},
        {canola,".*",
                {git,"git://github.com/basho/canola.git",
                     "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},
@@ -178,5 +179,6 @@
        {rebar_lock_deps_plugin,".*",
                                {git,"https://github.com/basho/rebar_lock_deps_plugin.git",
                                     "8816f45ff38cd04d5c7741bd39166af58116dd44"}}]}.
+{plugin_dir,"deps"}.
 {plugins,[rebar_lock_deps_plugin]}.
 

From 8c1ac7507fdcdac1ed23cd67471c28bba11de1c3 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Tue, 7 Aug 2018 12:43:03 +0400
Subject: [PATCH 09/31] =?UTF-8?q?yokozuna=20=E2=86=92=20tools=20scripts:?=
 =?UTF-8?q?=20=E2=80=98.=E2=80=99=20files=20correctly?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rebar.config.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config.lock b/rebar.config.lock
index 3cdbbafd1..0d6b14eae 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -157,7 +157,7 @@
                    "ab91dfc11a6bcda0966eb662e9c6e5875ecfc3dc"}},
        {yokozuna,".*",
                  {git,"https://github.com/Sentenai/yokozuna.git",
-                      "6c789d7165421adee732f6bf5c78df8d47dc44c3"}},
+                      "cf698d140cbdbaef5c7b9facd064738261710952"}},
        {canola,".*",
                {git,"git://github.com/basho/canola.git",
                     "9bdfee88fce20b3a01b7003696b53eb21913d6fb"}},

From 880311906f8829cc5a0066397b5214df3edf2d20 Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Thu, 16 May 2019 11:25:59 +0400
Subject: [PATCH 10/31] =?UTF-8?q?yoko=20=E2=86=92=20Sentenai/yoko?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rebar.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config b/rebar.config
index 96c9af9f1..36d75eed6 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,7 +24,7 @@
         {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
         {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
         {riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "riak_kv-2.9.0p1"}}},
-	{yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {branch, "fresh-solr"}}},
+	{yokozuna, ".*", {git, "git://github.com/Sentenai/yokozuna.git", {branch, "fresh-solr"}}},
         {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
        ]}.
 

From b5936ef9d8c9987b179d6968f30fc728d728f39f Mon Sep 17 00:00:00 2001
From: Antonio Nikishaev <me@lelf.lu>
Date: Thu, 16 May 2019 11:40:28 +0400
Subject: [PATCH 11/31] rebar lock

---
 rebar.config      | 2 +-
 rebar.config.lock | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rebar.config b/rebar.config
index 36d75eed6..9bae5d0f5 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,7 +24,7 @@
         {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
         {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
         {riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "riak_kv-2.9.0p1"}}},
-	{yokozuna, ".*", {git, "git://github.com/Sentenai/yokozuna.git", {branch, "fresh-solr"}}},
+	{yokozuna, ".*", {git, "git://github.com/Sentenai/yokozuna.git", {tag, "riak-2.9.0-sentenai"}}},
         {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
        ]}.
 
diff --git a/rebar.config.lock b/rebar.config.lock
index bcac52075..7a673f369 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -3,6 +3,7 @@
 {sub_dirs,["rel","apps/riak"]}.
 {require_otp_vsn,"R16|17"}.
 {cover_enabled,true}.
+{recursive_cmds,[xref]}.
 {lib_dirs,["apps/riak"]}.
 {erl_opts,[debug_info,fail_on_warning]}.
 {eunit_opts,[verbose]}.
@@ -182,8 +183,8 @@
               {git,"git://github.com/basho/riak-erlang-client",
                    "ab91dfc11a6bcda0966eb662e9c6e5875ecfc3dc"}},
        {yokozuna,".*",
-                 {git,"git://github.com/basho/yokozuna.git",
-                      "5d028e1308cb6ac100b28a2111efa4e444bab5be"}},
+                 {git,"git://github.com/Sentenai/yokozuna.git",
+                      "fdeffe7cd6f1ed80fd61df4e5d7f7b76785e54bc"}},
        {rebar_lock_deps_plugin,".*",
                                {git,"https://github.com/basho/rebar_lock_deps_plugin.git",
                                     "8816f45ff38cd04d5c7741bd39166af58116dd44"}}]}.

From 8d58cdc64717018f1f1fabe613e4460723f0e2bb Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 16 Jul 2019 09:29:10 +1000
Subject: [PATCH 12/31] fix: setup ci

---
 .gitlab-ci.yml | 27 +++++++++++++++++++++++++++
 Dockerfile     | 14 ++++++++++++++
 build.sh       |  3 +++
 3 files changed, 44 insertions(+)
 create mode 100644 .gitlab-ci.yml
 create mode 100644 Dockerfile
 create mode 100644 build.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..bb1d8ef47
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,27 @@
+image: docker:stable
+
+services:
+  - docker:dind
+
+variables:
+  CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
+  DOCKER_HOST: tcp://docker:2375
+  DOCKER_DRIVER: overlay2
+
+cache:
+  paths:
+    - /tmp/solr/
+
+before_script:
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
+
+build:
+  stage: build
+  artifacts:
+    paths:
+      - package/packages/riak*x86_64.rpm
+  script:
+    - docker pull $CONTAINER_IMAGE:latest || true
+    - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .
+    - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
+    - docker push $CONTAINER_IMAGE:latest
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000..29e599520
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM centos:7
+# https://gist.github.com/seanjensengrey/808544636b5f3715625584fc1c97615a
+RUN curl -O https://raw.githubusercontent.com/kerl/kerl/master/kerl
+RUN chmod +x kerl
+RUN yum install -y gcc gcc-c++ glibc-devel make ncurses-devel openssl-devel \
+	autoconf java-1.8.0-openjdk-devel git \
+	pam-devel perl-Digest-SHA
+RUN CFLAGS="-DOPENSSL_NO_EC=1" ./kerl build git https://github.com/basho/otp OTP_R16B02_basho10 R16B02-basho10
+RUN ./kerl install R16B02-basho10 /opt/erlang/R16B02-basho10
+RUN . /opt/erlang/R16B02-basho10/activate
+RUN mkdir -p /var/src/riak
+WORKDIR /var/src/riak
+RUN yum install -y which
+RUN yum install -y rpm-build
\ No newline at end of file
diff --git a/build.sh b/build.sh
new file mode 100644
index 000000000..6c62ee574
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,3 @@
+. /opt/erlang/R16B02-basho10/activate
+make rel
+make package

From 0e030af33bf7a80ea4529ac8f8683f99998179ae Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 16 Jul 2019 09:30:36 +1000
Subject: [PATCH 13/31] fix: build riak in docker container

---
 Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 29e599520..d0648d7a0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,4 +11,6 @@ RUN . /opt/erlang/R16B02-basho10/activate
 RUN mkdir -p /var/src/riak
 WORKDIR /var/src/riak
 RUN yum install -y which
-RUN yum install -y rpm-build
\ No newline at end of file
+RUN yum install -y rpm-build
+ADD . /var/src/riak/
+RUN sh -x ./build.sh
\ No newline at end of file

From ccf5809e5d27c0b201f0c900ec0c1649cc9ba8ef Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 16 Jul 2019 10:19:16 +1000
Subject: [PATCH 14/31] fix: artifact paths

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb1d8ef47..c0e2910bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build:
   stage: build
   artifacts:
     paths:
-      - package/packages/riak*x86_64.rpm
+      - distdir/packages/riak*x86_64.rpm
   script:
     - docker pull $CONTAINER_IMAGE:latest || true
     - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .

From 61f21ed840084f0fccc83fa2dc0e6965d81bedd0 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 16 Jul 2019 10:22:10 +1000
Subject: [PATCH 15/31] fix: disable explicit dockerhost

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0e2910bf..f8ea0e648 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ services:
 
 variables:
   CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
-  DOCKER_HOST: tcp://docker:2375
+  #DOCKER_HOST: tcp://localhost:2375
   DOCKER_DRIVER: overlay2
 
 cache:

From d42db26c608442c9b191c6a0529233db715566bf Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 16 Jul 2019 16:38:34 +1000
Subject: [PATCH 16/31] fix: use full path

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8ea0e648..c5053e295 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build:
   stage: build
   artifacts:
     paths:
-      - distdir/packages/riak*x86_64.rpm
+      - /var/src/riak/distdir/packages/riak*x86_64.rpm
   script:
     - docker pull $CONTAINER_IMAGE:latest || true
     - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .

From 5a75e76aa8ffbdb24fe672232409d18d49999d3f Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 16 Jul 2019 19:48:23 +1000
Subject: [PATCH 17/31] fix: artifact path

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5053e295..158b352fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build:
   stage: build
   artifacts:
     paths:
-      - /var/src/riak/distdir/packages/riak*x86_64.rpm
+      - "/var/src/riak/distdir/packages/riak*x86_64.rpm"
   script:
     - docker pull $CONTAINER_IMAGE:latest || true
     - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .

From d311c1df32c2992565e3739ec22e6c6b118374a4 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 16 Jul 2019 22:31:01 +1000
Subject: [PATCH 18/31] fix: try path

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 158b352fe..37fcff798 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ build:
   stage: build
   artifacts:
     paths:
-      - "/var/src/riak/distdir/packages/riak*x86_64.rpm"
+      - "/var/src/riak/distdir/packages/*.rpm"
   script:
     - docker pull $CONTAINER_IMAGE:latest || true
     - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .

From 736648c8671d6dba646130febf98a5411509f016 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Sat, 19 Oct 2019 10:04:25 +1100
Subject: [PATCH 19/31] fix: add artifacts glob

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 37fcff798..31d81b69a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,6 +11,7 @@ variables:
 cache:
   paths:
     - /tmp/solr/
+    - /var/src/riak/distdir/
 
 before_script:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com

From f2390d2170733479dfac679aadf7a2da99cf23f5 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Sat, 19 Oct 2019 11:28:27 +1100
Subject: [PATCH 20/31] fix: try glob all

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 31d81b69a..a7a30aa2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,7 @@ build:
   stage: build
   artifacts:
     paths:
-      - "/var/src/riak/distdir/packages/*.rpm"
+      - "/var/src/riak/distdir/packages/*"
   script:
     - docker pull $CONTAINER_IMAGE:latest || true
     - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .

From 46270b77b2de3932b29c933c97e08122fe5f517d Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Sat, 19 Oct 2019 12:09:26 +1100
Subject: [PATCH 21/31] fix: use our runners

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7a30aa2d..8bdd51e2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ services:
 
 variables:
   CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
-  #DOCKER_HOST: tcp://localhost:2375
+  DOCKER_HOST: tcp://localhost:2375
   DOCKER_DRIVER: overlay2
 
 cache:

From ef6315f6f13e242333ff30662ab7fa07573106f9 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Sat, 19 Oct 2019 12:39:45 +1100
Subject: [PATCH 22/31] fix: copy packages to host machine

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8bdd51e2e..93c57696f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ variables:
   CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
   DOCKER_HOST: tcp://localhost:2375
   DOCKER_DRIVER: overlay2
+  DOCKER_TLS_CERTDIR: ""
 
 cache:
   paths:
@@ -20,9 +21,10 @@ build:
   stage: build
   artifacts:
     paths:
-      - "/var/src/riak/distdir/packages/*"
+      - "/tmp/packages/*.rpm"
   script:
     - docker pull $CONTAINER_IMAGE:latest || true
     - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .
+    - docker cp $(docker create $CONTAINER_IMAGE:latest):"/var/src/riak/distdir/packages/" /tmp/packages
     - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
     - docker push $CONTAINER_IMAGE:latest

From 9116fa32a6fd5e57c7844227b8a022d109a5f509 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 21 Jan 2020 15:30:48 +1100
Subject: [PATCH 23/31] fix: clone url for yokozuna

---
 rebar.config      | 2 +-
 rebar.config.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index 3d2224e59..dc027d4e5 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,7 +24,7 @@
         {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
         {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
         {riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "riak_kv-2.9.0p1"}}},
-	{yokozuna, ".*", {git, "git://gitlab.com/riak/yokozuna.git", {branch, "fresh-solr+2.9.0p6"}}},
+	{yokozuna, ".*", {git, "https://gitlab.com/riak/yokozuna.git", {branch, "fresh-solr+2.9.0p6"}}},
         {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
        ]}.
 
diff --git a/rebar.config.lock b/rebar.config.lock
index c38f747d0..a4919200b 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -186,7 +186,7 @@
               {git,"git://github.com/basho/riak-erlang-client",
                    "6ca6620dae3a00264a0a0ab0c59139125f70523b"}},
        {yokozuna,".*",
-                 {git,"git://gitlab.com/riak/yokozuna.git",
+                 {git,"https://gitlab.com/riak/yokozuna.git",
                       "f6d223869e0a3fbe23602411c0cf1e6eb7df9ed2"}},
        {rebar_lock_deps_plugin,".*",
                                {git,"https://github.com/basho/rebar_lock_deps_plugin.git",

From 7ba6cccd94e852d0d8e00b5c6089f2cac709e333 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 21 Jan 2020 15:56:11 +1100
Subject: [PATCH 24/31] fix: build common base image

---
 .gitlab-ci.yml  | 26 ++++++++++++++++++++------
 Dockerfile      | 19 ++++---------------
 Dockerfile.base | 15 +++++++++++++++
 3 files changed, 39 insertions(+), 21 deletions(-)
 create mode 100644 Dockerfile.base

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 93c57696f..e5bbdc057 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,14 +17,28 @@ cache:
 before_script:
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
 
-build:
-  stage: build
+stages:
+  - base
+  - riak
+
+base:
+  stage: base
+  script:
+    - docker pull $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:latest || true
+    - docker build --cache-from $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:latest --tag $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:latest  --build-arg deployment=$CI_COMMIT_REF_NAME -f Dockerfile.base .
+    - docker push $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
+    - docker push $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:latest
+
+riak:
+  stage: riak
   artifacts:
     paths:
       - "/tmp/packages/*.rpm"
   script:
-    - docker pull $CONTAINER_IMAGE:latest || true
-    - docker build --cache-from $CONTAINER_IMAGE:latest --tag $CONTAINER_IMAGE:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE:latest .
+    - docker pull $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:latest || true
+    - docker pull $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest || true
+    - docker build --cache-from $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest --tag $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest  --build-arg deployment=$CI_COMMIT_REF_NAME .
     - docker cp $(docker create $CONTAINER_IMAGE:latest):"/var/src/riak/distdir/packages/" /tmp/packages
-    - docker push $CONTAINER_IMAGE:$CI_COMMIT_SHA
-    - docker push $CONTAINER_IMAGE:latest
+    - docker push $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
+    - docker push $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest
+    #- curl --header "Content-Type:application/json" --request POST --data '{"event_type":"registry_push","tag":"'"$CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA"'","deployment":"'"$CI_COMMIT_REF_NAME"'"}' https://salt.streethawk.com:8000/hook/gitlab/streethawk/riak
diff --git a/Dockerfile b/Dockerfile
index d0648d7a0..bd777ac97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,5 @@
-FROM centos:7
-# https://gist.github.com/seanjensengrey/808544636b5f3715625584fc1c97615a
-RUN curl -O https://raw.githubusercontent.com/kerl/kerl/master/kerl
-RUN chmod +x kerl
-RUN yum install -y gcc gcc-c++ glibc-devel make ncurses-devel openssl-devel \
-	autoconf java-1.8.0-openjdk-devel git \
-	pam-devel perl-Digest-SHA
-RUN CFLAGS="-DOPENSSL_NO_EC=1" ./kerl build git https://github.com/basho/otp OTP_R16B02_basho10 R16B02-basho10
-RUN ./kerl install R16B02-basho10 /opt/erlang/R16B02-basho10
-RUN . /opt/erlang/R16B02-basho10/activate
-RUN mkdir -p /var/src/riak
-WORKDIR /var/src/riak
-RUN yum install -y which
-RUN yum install -y rpm-build
+ARG deployment
+FROM registry.gitlab.com/riak/riak/base/${deployment}:latest
+ARG deployment
 ADD . /var/src/riak/
-RUN sh -x ./build.sh
\ No newline at end of file
+RUN sh -x ./build.sh
diff --git a/Dockerfile.base b/Dockerfile.base
new file mode 100644
index 000000000..41cebb9fc
--- /dev/null
+++ b/Dockerfile.base
@@ -0,0 +1,15 @@
+FROM centos:7
+ARG deployment
+# https://gist.github.com/seanjensengrey/808544636b5f3715625584fc1c97615a
+RUN curl -O https://raw.githubusercontent.com/kerl/kerl/master/kerl
+RUN chmod +x kerl
+RUN yum install -y gcc gcc-c++ glibc-devel make ncurses-devel openssl-devel \
+	autoconf java-1.8.0-openjdk-devel git \
+	pam-devel perl-Digest-SHA
+RUN CFLAGS="-DOPENSSL_NO_EC=1" ./kerl build git https://github.com/basho/otp OTP_R16B02_basho10 R16B02-basho10
+RUN ./kerl install R16B02-basho10 /opt/erlang/R16B02-basho10
+RUN . /opt/erlang/R16B02-basho10/activate
+RUN mkdir -p /var/src/riak
+WORKDIR /var/src/riak
+RUN yum install -y which
+RUN yum install -y rpm-build

From ca7bc164d4cc990ae1a2df7ae5468720c56afa17 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Tue, 21 Jan 2020 17:00:41 +1100
Subject: [PATCH 25/31] fix: rename yokozuna branch

---
 rebar.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config b/rebar.config
index dc027d4e5..4fff67635 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,7 +24,7 @@
         {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
         {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
         {riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "riak_kv-2.9.0p1"}}},
-	{yokozuna, ".*", {git, "https://gitlab.com/riak/yokozuna.git", {branch, "fresh-solr+2.9.0p6"}}},
+	{yokozuna, ".*", {git, "https://gitlab.com/riak/yokozuna.git", {branch, "fresh-solr-2.9.0p6"}}},
         {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
        ]}.
 

From 6e0b6fb7ce0159d60b1e067aa3484e0a93589829 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@series9.localdomain>
Date: Tue, 21 Jan 2020 23:10:25 +1100
Subject: [PATCH 26/31] fix: copy package

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5bbdc057..de88eeac7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,7 +38,7 @@ riak:
     - docker pull $CONTAINER_IMAGE/base/$CI_COMMIT_REF_NAME:latest || true
     - docker pull $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest || true
     - docker build --cache-from $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest --tag $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA --tag $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest  --build-arg deployment=$CI_COMMIT_REF_NAME .
-    - docker cp $(docker create $CONTAINER_IMAGE:latest):"/var/src/riak/distdir/packages/" /tmp/packages
+    - docker cp $(docker create $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest):"/var/src/riak/distdir/packages/" /tmp/packages
     - docker push $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
     - docker push $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest
     #- curl --header "Content-Type:application/json" --request POST --data '{"event_type":"registry_push","tag":"'"$CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA"'","deployment":"'"$CI_COMMIT_REF_NAME"'"}' https://salt.streethawk.com:8000/hook/gitlab/streethawk/riak

From ba0d192fe138caaae6c83182dc6c1844501c4a3f Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Thu, 23 Jan 2020 16:25:01 +1100
Subject: [PATCH 27/31] fix: run tests

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sh b/build.sh
index 6c62ee574..d650927e3 100644
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,4 @@
 . /opt/erlang/R16B02-basho10/activate
 make rel
+make test
 make package

From 4e5eb3aeb2aa4b025aba7aa86b1f71d7dca7ec3c Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Mon, 24 Feb 2020 10:12:55 +1100
Subject: [PATCH 28/31] fix: uppdate yokozuna version

---
 rebar.config.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rebar.config.lock b/rebar.config.lock
index 64d0f9b27..c95358485 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -187,7 +187,7 @@
                   "21c6e52ced3af294f2fe636039106068da12eeeb"}},
        {yokozuna,".*",
                  {git,"https://gitlab.com/riak/yokozuna.git",
-                      "f6d223869e0a3fbe23602411c0cf1e6eb7df9ed2"}},
+                      "95a1bef13efd1beee8f987a6a314f8f3030c7354"}},
        {rebar_lock_deps_plugin,".*",
                                {git,"https://github.com/basho/rebar_lock_deps_plugin.git",
                                     "8816f45ff38cd04d5c7741bd39166af58116dd44"}}]}.

From 79e84d0aa3f6524b2f2baea5ce12ca0c4473d158 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Mon, 24 Feb 2020 14:06:51 +1100
Subject: [PATCH 29/31] fix: bump version in reltool

---
 rel/reltool.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rel/reltool.config b/rel/reltool.config
index ae43e6276..09e4f088e 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -2,7 +2,7 @@
 %% ex: ft=erlang ts=4 sw=4 et
 {sys, [
        {lib_dirs, ["../deps"]},
-       {rel, "riak", "2.9.0-sentenai",
+       {rel, "riak", "2.9.1-sentenai",
         [
          kernel,
          stdlib,

From 6b941ad0fe52cc958e1850aabf97ad18b41035ec Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Mon, 2 Mar 2020 09:20:24 +1100
Subject: [PATCH 30/31] fix: update branch for yokozuna

---
 rebar.config      | 2 +-
 rebar.config.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rebar.config b/rebar.config
index 6d234eeb1..8c4190fdf 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,7 +24,7 @@
         {riaknostic, ".*", {git, "git://github.com/basho/riaknostic.git", {tag, "2.1.7"}}},
         {riak_auth_mods, ".*", {git, "git://github.com/basho/riak_auth_mods.git", {tag, "2.1.0"}}},
         {riak_repl, ".*", {git, "git://github.com/basho/riak_repl.git", {tag, "riak_kv-2.9.1"}}},
-        {yokozuna, ".*", {git, "https://gitlab.com/riak/yokozuna.git", {branch, "fresh-solr-2.9.1"}}},
+        {yokozuna, ".*", {git, "git://github.com/basho/yokozuna.git", {branch, "fresh-solr-2.9.1-oss"}}},
         {rebar_lock_deps_plugin, ".*", {git, "https://github.com/basho/rebar_lock_deps_plugin.git", {tag, "3.1.0p1"}}}
        ]}.
 
diff --git a/rebar.config.lock b/rebar.config.lock
index c95358485..9e6d7425a 100644
--- a/rebar.config.lock
+++ b/rebar.config.lock
@@ -186,7 +186,7 @@
              {git,"https://github.com/jlouis/fuse.git",
                   "21c6e52ced3af294f2fe636039106068da12eeeb"}},
        {yokozuna,".*",
-                 {git,"https://gitlab.com/riak/yokozuna.git",
+                 {git,"git://github.com/basho/yokozuna.git",
                       "95a1bef13efd1beee8f987a6a314f8f3030c7354"}},
        {rebar_lock_deps_plugin,".*",
                                {git,"https://github.com/basho/rebar_lock_deps_plugin.git",

From ece71dc7edf7b600bf247a69c577390c19881186 Mon Sep 17 00:00:00 2001
From: Steven Joseph <steven@pointzi.com>
Date: Mon, 2 Mar 2020 09:28:31 +1100
Subject: [PATCH 31/31] fix: remove references to streethawk and sentenai

---
 .gitlab-ci.yml     | 1 -
 Makefile           | 2 +-
 rel/reltool.config | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de88eeac7..a2f87ff47 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,4 +41,3 @@ riak:
     - docker cp $(docker create $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest):"/var/src/riak/distdir/packages/" /tmp/packages
     - docker push $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
     - docker push $CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:latest
-    #- curl --header "Content-Type:application/json" --request POST --data '{"event_type":"registry_push","tag":"'"$CONTAINER_IMAGE/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA"'","deployment":"'"$CI_COMMIT_REF_NAME"'"}' https://salt.streethawk.com:8000/hook/gitlab/streethawk/riak
diff --git a/Makefile b/Makefile
index d0073d622..2f73f55db 100644
--- a/Makefile
+++ b/Makefile
@@ -258,7 +258,7 @@ NAME_HASH = $(shell git hash-object distdir/$(CLONEDIR)/$(MANIFEST_FILE) 2>/dev/
 ifeq ($(REVISION), $(MAJOR_VERSION))
 PKG_ID := $(REPO_TAG)
 else
-PKG_ID = $(REPO)-$(MAJOR_VERSION)-sentenai-$(NAME_HASH)
+PKG_ID = $(REPO)-$(MAJOR_VERSION)-$(NAME_HASH)
 endif
 
 # To ensure a clean build, copy the CLONEDIR at a specific tag to a new directory
diff --git a/rel/reltool.config b/rel/reltool.config
index 09e4f088e..a6b3dde87 100644
--- a/rel/reltool.config
+++ b/rel/reltool.config
@@ -2,7 +2,7 @@
 %% ex: ft=erlang ts=4 sw=4 et
 {sys, [
        {lib_dirs, ["../deps"]},
-       {rel, "riak", "2.9.1-sentenai",
+       {rel, "riak", "2.9.1",
         [
          kernel,
          stdlib,