Merge pull request #69984 from cockroachdb/blathers/backport-release-…

…21.2-69968
cockroachdb · Sep 11, 2021 · 4811bb9 · 4811bb9
2 parents 67d7ad2 + e2708ab
commit 4811bb9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build/teamcity-check.sh b/build/teamcity-check.sh
@@ -2,7 +2,7 @@
 
 # Set this to 1 to require a "release justification" note in the commit message
 # or the PR description.
-require_justification=1
+require_justification=0
 
 set -euo pipefail
 

diff --git a/githooks/commit-msg b/githooks/commit-msg
@@ -52,7 +52,7 @@ IFS='
 notes=($($grep -iE '^release note' "$1"))
 
 # Set this to 1 to require a release justification note.
-require_justification=1
+require_justification=0
 justification=($($grep -iE '^release justification: \S+' "$1"))
 
 IFS=$saveIFS

diff --git a/githooks/prepare-commit-msg b/githooks/prepare-commit-msg
@@ -2,7 +2,7 @@
 #
 # Prepare the commit message by adding a release note.
 
-require_justification=1
+require_justification=0
 set -euo pipefail
 
 if [[ "${2-}" = "message" ]]; then