From 582bbcc848ac1dff3be7a6bbe6b85d04a5b9b87f Mon Sep 17 00:00:00 2001
From: Martin Sumner <martin.sumner@adaptip.co.uk>
Date: Sun, 29 May 2022 23:44:08 +0100
Subject: [PATCH] Updated with tags for release

---
 priv/riak.schema | 14 --------------
 rebar.config     | 12 ++++++------
 rebar.lock       | 28 ++++++++++++++--------------
 3 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/priv/riak.schema b/priv/riak.schema
index d0773734f..ba72c948f 100644
--- a/priv/riak.schema
+++ b/priv/riak.schema
@@ -289,20 +289,6 @@
     merge
 ]}.
 
-%% @doc Force move on realloc for process heap
-{mapping, "erlang.eheap_memory.ramv", "vm_args.+MHramv", [
-    {commented, "false"},
-    {datatype, {enum, [true, false]}},
-    merge
-]}.
-
-%% @doc Force move on realloc for binary heap
-{mapping, "erlang.binary_memory.ramv", "vm_args.+MBramv", [
-    {commented, "false"},
-    {datatype, {enum, [true, false]}},
-    merge
-]}.
-
  %% @doc Set allocation strategy for binary multiblock carriers.  Default is
 %% not predictable - do not rely on aoffcbf being the default.  For more info
 %% see:
diff --git a/rebar.config b/rebar.config
index 5e4dc8c11..43ee60b27 100644
--- a/rebar.config
+++ b/rebar.config
@@ -9,19 +9,19 @@
 {eunit_opts, [nowarn_export_all, verbose]}.
 
 {deps, [
-        {lager_syslog, {git, "https://github.com/basho/lager_syslog.git", {branch, "develop-3.0"}}},
+        {lager_syslog, {git, "https://github.com/basho/lager_syslog.git", {tag, "3.1.1"}}},
         {cluster_info, {git, "https://github.com/basho/cluster_info.git", {tag, "2.1.0"}}},
-        {riak_kv, {git, "https://github.com/basho/riak_kv.git", {branch, "develop-3.0"}}},
-        {riak_auth_mods, {git, "https://github.com/basho/riak_auth_mods.git", {branch, "develop-3.0"}}},
-        {riaknostic, {git, "https://github.com/basho/riaknostic.git", {branch, "develop-3.0"}}},
+        {riak_kv, {git, "https://github.com/basho/riak_kv.git", {tag, "riak_kv-3.0.10"}}},
+        {riak_auth_mods, {git, "https://github.com/basho/riak_auth_mods.git", {tag, "riak_kv-3.0.10"}}},
+        {riaknostic, {git, "https://github.com/basho/riaknostic.git", {tag, "riak_kv-3.0.10"}}},
 
         % {yokozuna, {git, "https://github.com/basho/yokozuna.git", {branch, "develop-3.0"}}},
 
-        {riak_repl, {git, "https://github.com/basho/riak_repl.git", {branch, "develop-3.0"}}}
+        {riak_repl, {git, "https://github.com/basho/riak_repl.git", {tag, "riak_kv-3.0.10"}}}
       ]}.
 
 {project_plugins, [
-    {rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {branch, "develop-3.0"}}}
+    {rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {tag, "0.2.1"}}}
 ]}.
 
 {cuttlefish, [
diff --git a/rebar.lock b/rebar.lock
index 37f1ff748..9ba3878e4 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -14,7 +14,7 @@
   1},
  {<<"clique">>,
   {git,"https://github.com/basho/clique.git",
-       {ref,"3e6d031ecda8a30b7679d9da47f487e202f2dc1b"}},
+       {ref,"9ad8515dfeebf7d324b6d56eab8670c0b8995ce0"}},
   2},
  {<<"cluster_info">>,
   {git,"https://github.com/basho/cluster_info.git",
@@ -30,7 +30,7 @@
   1},
  {<<"eleveldb">>,
   {git,"https://github.com/basho/eleveldb.git",
-       {ref,"4962acd94662a192456b6fd5fc5d6b40f3bce8a3"}},
+       {ref,"b482410fd6d996d9d71d79c2b2fb9c0ddafc6bd1"}},
   2},
  {<<"exometer_core">>,{pkg,<<"exometer_core">>,<<"1.6.1">>},2},
  {<<"folsom">>,{pkg,<<"folsom">>,<<"1.0.0">>},3},
@@ -50,7 +50,7 @@
   2},
  {<<"kv_index_tictactree">>,
   {git,"https://github.com/martinsumner/kv_index_tictactree.git",
-       {ref,"5ca15cfe24b84923c4985ff4c6d359a6489f646a"}},
+       {ref,"d491d8efd688a04354ea41ced665e7ce8d9a8658"}},
   1},
  {<<"lager">>,
   {git,"https://github.com/erlang-lager/lager.git",
@@ -58,7 +58,7 @@
   1},
  {<<"lager_syslog">>,
   {git,"https://github.com/basho/lager_syslog.git",
-       {ref,"f044581b21b5d6690ac90c4d631fd836160337a0"}},
+       {ref,"5c8eb6ec82fa45ff0f4e456747e095654e342746"}},
   0},
  {<<"leveled">>,
   {git,"https://github.com/martinsumner/leveled",
@@ -103,15 +103,15 @@
   1},
  {<<"riak_api">>,
   {git,"https://github.com/basho/riak_api.git",
-       {ref,"e5e1fe0d2eed500f4c93f53110d9d1efdae2b675"}},
+       {ref,"a4a17fc1d9a3bf2096358b2f779e8f599fa79a30"}},
   1},
  {<<"riak_auth_mods">>,
   {git,"https://github.com/basho/riak_auth_mods.git",
-       {ref,"c7f16fb0a54d9f7bc96904bc38a9cc73d23f0f41"}},
+       {ref,"5e4a240791f6bbadc9b3bce4653ba08cb9aeb0ce"}},
   0},
  {<<"riak_core">>,
   {git,"https://github.com/basho/riak_core.git",
-       {ref,"c54233c68ada99b4cf86618d896e0b7335f3eb5c"}},
+       {ref,"e8e329e684a236dea4f7719c73230e5458bc7722"}},
   1},
  {<<"riak_dt">>,
   {git,"https://github.com/basho/riak_dt.git",
@@ -119,11 +119,11 @@
   1},
  {<<"riak_ensemble">>,
   {git,"https://github.com/basho/riak_ensemble",
-       {ref,"573a271aa546dcdcaeaaf09b3de6949a3130e021"}},
+       {ref,"163bafa1a29db14f242e164dbe79b3fa84c3173d"}},
   2},
  {<<"riak_kv">>,
   {git,"https://github.com/basho/riak_kv.git",
-       {ref,"c28826b2f22f6bf35294104898251c4d3743c6e8"}},
+       {ref,"c656fb47f3933d1c0d60f3469f7b0158d0c39e54"}},
   0},
  {<<"riak_pb">>,
   {git,"https://github.com/basho/riak_pb.git",
@@ -135,19 +135,19 @@
   1},
  {<<"riak_repl">>,
   {git,"https://github.com/basho/riak_repl.git",
-       {ref,"e2ad0452f4946967bf504b0112ed1fb433e1c652"}},
+       {ref,"ca79f6a7714108f4d238499679b954493b1ecf06"}},
   0},
  {<<"riak_sysmon">>,
   {git,"https://github.com/basho/riak_sysmon.git",
-       {ref,"750192f923435aff5dcf474b5e748cf4ca10cc1e"}},
+       {ref,"bb75c2b8fd2e1074ffded60054f3a17b745957aa"}},
   2},
  {<<"riakc">>,
   {git,"https://github.com/basho/riak-erlang-client",
-       {ref,"bdfc8f0b87e09fe946d2b0f0595d94ece43c5f1b"}},
+       {ref,"467deeb1eee6830a6945249bc9745900766d77c0"}},
   2},
  {<<"riakhttpc">>,
   {git,"https://github.com/basho/riak-erlang-http-client",
-       {ref,"75d35da7e2617b647ede55950e246870e8ca0d7f"}},
+       {ref,"a99e0401ff670177f8a1a00d089db6970448ac66"}},
   1},
  {<<"riaknostic">>,
   {git,"https://github.com/basho/riaknostic.git",
@@ -164,7 +164,7 @@
   1},
  {<<"syslog">>,
   {git,"https://github.com/basho/erlang-syslog",
-       {ref,"370e795feae8f5bf84a2ee76a1e1e5a766b3930f"}},
+       {ref,"b6d4db6fcaf5ce1031c77a1582e3ccd24b9ae0e8"}},
   1},
  {<<"webmachine">>,
   {git,"https://github.com/webmachine/webmachine.git",