diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2017-01-12 16:26:46 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-01-12 16:27:09 +0000 |
| commit | f24402c59aee6fcdd4383258e544135f2c19039b (patch) | |
| tree | 41c25b0ffdaf6fe6a932e399c393f6709855dc10 /testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch | |
| parent | c91bba7beb3a5cb3204fa59656532a80def51c39 (diff) | |
| download | aports-f24402c59aee6fcdd4383258e544135f2c19039b.tar.bz2 aports-f24402c59aee6fcdd4383258e544135f2c19039b.tar.xz | |
testing/kubernetes: moved from unmaintained, fixed build, upgrade to 1.5.2
Diffstat (limited to 'testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch')
| -rw-r--r-- | testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch b/testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch new file mode 100644 index 0000000000..e5542acd01 --- /dev/null +++ b/testing/kubernetes/get-rid-of-the-git-commands-in-mungedocs.patch @@ -0,0 +1,25 @@ +From d1e796b3e56b6f3237913cc6b57b6d5918bcac63 Mon Sep 17 00:00:00 2001 +From: Jan Chaloupka <jchaloup@redhat.com> +Date: Thu, 5 Jan 2017 10:06:38 +0100 +Subject: [PATCH] get rid of the git commands in mungedocs + +--- + src/k8s.io/kubernetes/hack/update-munge-docs.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hack/update-munge-docs.sh b/hack/update-munge-docs.sh +index 4fa8d18..ec18685 100755 +--- a/hack/update-munge-docs.sh ++++ b/hack/update-munge-docs.sh +@@ -21,7 +21,7 @@ set -o pipefail + KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. + source "${KUBE_ROOT}/hack/lib/init.sh" + +-git_upstream=$(kube::util::git_upstream_remote_name) ++git_upstream=origin + : ${git_upstream:="upstream"} + + kube::golang::setup_env +-- +2.7.4 + |