From 7554b1f6b037eb00dcd976a6335c2c8b90b73be3 Mon Sep 17 00:00:00 2001
From: Ricky Stewart <ricky@cockroachlabs.com>
Date: Mon, 28 Feb 2022 10:47:57 -0600
Subject: [PATCH 1/2] ccl/sqlproxyccl: bump size of `tenant` test

Release justification: non-production code changes
Release note: None
---
 pkg/ccl/sqlproxyccl/tenant/BUILD.bazel | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel b/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel
index 26151a7cbf28..5d9b0dfd9c3d 100644
--- a/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel
+++ b/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel
@@ -45,6 +45,7 @@ go_library(
 
 go_test(
     name = "tenant_test",
+    size = "large",
     srcs = [
         "directory_test.go",
         "main_test.go",

From d1287bf5f2a7648db77ccb070ef926e584c01c1e Mon Sep 17 00:00:00 2001
From: Oliver Tan <otan@cockroachlabs.com>
Date: Tue, 1 Mar 2022 07:18:20 +1100
Subject: [PATCH 2/2] activerecord: bump version

Contains smarter versioning which hopefully fixes this interval style
issue which I think has to do with versioning.

Release justification: test only change

Release note: None
---
 pkg/cmd/roachtest/tests/activerecord.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/cmd/roachtest/tests/activerecord.go b/pkg/cmd/roachtest/tests/activerecord.go
index 58cbeb0e73b7..22b2674c722e 100644
--- a/pkg/cmd/roachtest/tests/activerecord.go
+++ b/pkg/cmd/roachtest/tests/activerecord.go
@@ -28,7 +28,7 @@ import (
 var activerecordResultRegex = regexp.MustCompile(`^(?P<test>[^\s]+#[^\s]+) = (?P<timing>\d+\.\d+ s) = (?P<result>.)$`)
 var railsReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)\.?(?P<subpoint>\d*)$`)
 var supportedRailsVersion = "6.1"
-var activerecordAdapterVersion = "v6.1.5"
+var activerecordAdapterVersion = "v6.1.6"
 
 // This test runs activerecord's full test suite against a single cockroach node.