Merge pull request #36096 from rmmh/disable-verify-owners

Automatic merge from submit-queue Disable the test-owners verify step until the merge conflicts are resolved It's causing more pain than it's preventing currently. There should be some simpler ways to fix this.

Merge pull request #36096 from rmmh/disable-verify-owners
04a74570 · Kubernetes Submit Queue · GitHub · fc6db328 · 57a152ca · 04a74570
Commit 04a74570 authored Nov 03, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

verify-test-owners.sh hack/verify-test-owners.sh +2 -0

No files found.
--- a/hack/verify-test-owners.sh
+++ b/hack/verify-test-owners.sh
@@ -20,8 +20,10 @@ set -o pipefail
 export KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
 source "${KUBE_ROOT}/hack/lib/init.sh"

+
 cd "${KUBE_ROOT}"
 if ! hack/update_owners.py --check; then
    echo 'Run ./hack/update_owners.py to fix it'
+    exit  # TODO(rmmh): fix Github merging to respect .gitattributes
    exit 1
 fi