Merge branch '4.0.x' into 4.1.x

jkao97 · jkao97 · commit a2bb25ef69bc · 2021-09-21T14:09:51.000-07:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,5 +2,5 @@
 common {
   slackChannel = '#connect-warn'
   upstreamProjects = ['confluentinc/schema-registry','confluentinc/common']
-  nodeLabel = 'docker-oraclejdk8'
+  nodeLabel = 'docker-debian-jdk8'
 }

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@`
`2`	`2`	`common {`
`3`	`3`	`slackChannel = '#connect-warn'`
`4`	`4`	`upstreamProjects = ['confluentinc/schema-registry','confluentinc/common']`
`5`		`- nodeLabel = 'docker-oraclejdk8'`
	`5`	`+ nodeLabel = 'docker-debian-jdk8'`
`6`	`6`	`}`