Merge branch '4.0.x' into 4.1.x

ConfluentJenkins · ConfluentJenkins · commit 60e7c178a38a · 2019-10-11T17:46:06.000Z
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -2,4 +2,5 @@
 common {
   slackChannel = '#connect-warn'
   upstreamProjects = 'confluentinc/common'
+  pintMerge = true
 }

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,5 @@`
`2`	`2`	`common {`
`3`	`3`	`slackChannel = '#connect-warn'`
`4`	`4`	`upstreamProjects = 'confluentinc/common'`
	`5`	`+ pintMerge = true`
`5`	`6`	`}`