Merge pull request #84114 from knz/backport-78255-211

cockroachdb · Jul 22, 2022 · d03dba5 · d03dba5
2 parents 5df10fe + 6d558f8
commit d03dba5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 25 deletions.
diff --git a/docs/generated/eventlog.md b/docs/generated/eventlog.md
@@ -238,8 +238,6 @@ An event of type `set_cluster_setting` is recorded when a cluster setting is cha
 Events in this category are generated when a table has been
 marked as audited via `ALTER TABLE ... EXPERIMENTAL_AUDIT SET`.
 
-{% include {{ page.version.version }}/misc/experimental-warning.md %}
-
 Note: These events are not written to `system.eventlog`, even
 when the cluster setting `system.eventlog.enabled` is set. They
 are only emitted via external logging.

diff --git a/pkg/acceptance/compose/gss/psql/Dockerfile b/pkg/acceptance/compose/gss/psql/Dockerfile
@@ -1,9 +1,9 @@
 # Build the test binary in a multistage build.
-FROM golang:1.15 AS builder
+FROM golang:1.16 AS builder
 WORKDIR /workspace
 COPY . .
-RUN go get -d -t -tags gss_compose
-RUN go test -v -c -tags gss_compose -o gss.test
+RUN GO111MODULE=off go get -d -t -tags gss_compose
+RUN GO111MODULE=off go test -v -c -tags gss_compose -o gss.test
 
 # Copy the test binary to an image with psql and krb installed.
 FROM postgres:11

diff --git a/pkg/util/log/eventpb/sql_audit_events.pb.go b/pkg/util/log/eventpb/sql_audit_events.pb.go
diff --git a/pkg/util/log/eventpb/sql_audit_events.proto b/pkg/util/log/eventpb/sql_audit_events.proto
@@ -50,8 +50,6 @@ message CommonSQLExecDetails {
 // Events in this category are generated when a table has been
 // marked as audited via `ALTER TABLE ... EXPERIMENTAL_AUDIT SET`.
 //
-// {% include {{ page.version.version }}/misc/experimental-warning.md %}
-//
 // Note: These events are not written to `system.eventlog`, even
 // when the cluster setting `system.eventlog.enabled` is set. They
 // are only emitted via external logging.

diff --git a/pkg/util/log/logconfig/config.go b/pkg/util/log/logconfig/config.go
@@ -18,8 +18,8 @@ import (
 
 	"github.com/cockroachdb/cockroach/pkg/util/log/logpb"
 	"github.com/cockroachdb/errors"
-	"github.com/dustin/go-humanize"
-	"gopkg.in/yaml.v2"
+	humanize "github.com/dustin/go-humanize"
+	yaml "gopkg.in/yaml.v2"
 )
 
 // DefaultFileFormat is the entry format for file sinks when not