Merge pull request #3639 from jean-edouard/revert-3618-add-timestamps

Manually forcing a merge without waiting for any CI. CI is broken until this is done.
kubevirt · Jun 23, 2020 · 0a8cebe · 0a8cebe
2 parents 2c829b1 + f13da81
commit 0a8cebe
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,5 @@
 export GO15VENDOREXPERIMENT := 1
 
-SHELL = ./hack/timestamps.sh
 
 all:
 	hack/dockerized "DOCKER_PREFIX=${DOCKER_PREFIX} DOCKER_TAG=${DOCKER_TAG} IMAGE_PULL_POLICY=${IMAGE_PULL_POLICY} VERBOSITY=${VERBOSITY} ./hack/build-manifests.sh && \

diff --git a/hack/timestamps.sh b/hack/timestamps.sh