diff --git a/.gitignore b/.gitignore index 9604ff4..a2d6f45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/origin-5f38cb0.tar.gz /kubernetes-86b4e77.tar.gz /contrib-99f38cc.tar.gz +/origin-e9a6ef1.tar.gz diff --git a/internal-to-inteernal.patch b/internal-to-inteernal.patch index 0f71229..789f13b 100644 --- a/internal-to-inteernal.patch +++ b/internal-to-inteernal.patch @@ -1,6 +1,6 @@ -From af5af041018cd0c8b89fde3f8684fe00290b386d Mon Sep 17 00:00:00 2001 +From 613cb303ac0d22786e9c4d153e993c6c8adcd2bb Mon Sep 17 00:00:00 2001 From: Jan Chaloupka -Date: Wed, 30 Sep 2015 09:57:57 +0200 +Date: Wed, 14 Oct 2015 12:37:01 +0200 Subject: [PATCH] internal to inteernal --- @@ -79,8 +79,7 @@ Subject: [PATCH] internal to inteernal .../src/github.com/gonum/internal/asm/zdotc.go | 25 -- .../src/github.com/gonum/internal/asm/zdotu.go | 23 -- .../src/github.com/gonum/matrix/mat64/inner.go | 2 +- - pkg/cmd/cli/describe/chaindescriber.go | 2 +- - 76 files changed, 1411 insertions(+), 1411 deletions(-) + 75 files changed, 1410 insertions(+), 1410 deletions(-) create mode 100644 Godeps/_workspace/src/github.com/gonum/graph/inteernal/linear.go create mode 100644 Godeps/_workspace/src/github.com/gonum/graph/inteernal/set.go create mode 100644 Godeps/_workspace/src/github.com/gonum/graph/inteernal/set_test.go @@ -3545,19 +3544,6 @@ index 77616ba..1610a83 100644 ) // Inner computes the generalized inner product -diff --git a/pkg/cmd/cli/describe/chaindescriber.go b/pkg/cmd/cli/describe/chaindescriber.go -index 2ca7c6e..2d2b6c8 100644 ---- a/pkg/cmd/cli/describe/chaindescriber.go -+++ b/pkg/cmd/cli/describe/chaindescriber.go -@@ -8,7 +8,7 @@ import ( - "github.com/golang/glog" - "github.com/gonum/graph" - "github.com/gonum/graph/encoding/dot" -- "github.com/gonum/graph/internal" -+ "github.com/gonum/graph/inteernal" - "github.com/gonum/graph/path" - kapi "k8s.io/kubernetes/pkg/api" - utilerrors "k8s.io/kubernetes/pkg/util/errors" -- 1.9.3 diff --git a/kubernetes.spec b/kubernetes.spec index 082ce6c..a2337b0 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -21,7 +21,7 @@ # https://github.com/openshift/origin %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path k8s.io/kubernetes -%global commit 5f38cb0e98c9e854cafba9c7f98dafd51e955ad8 +%global commit e9a6ef1cd4c29d45730289a497d18b19d7ba450d %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global openshift_ip github.com/openshift/origin @@ -58,7 +58,7 @@ Name: kubernetes Version: 1.1.0 -Release: 0.40.alpha1.git%{shortcommit}%{?dist} +Release: 0.41.alpha1.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -440,7 +440,7 @@ Kubernetes client tools like kubectl %setup -q -n %{repo}-%{commit} # copy contrib folder to origin -cp -r ../%{k8s_repo}-%{k8s_commit}/contrib contrib +cp -r ../%{k8s_repo}-%{k8s_commit}/contrib/completions/bash/kubectl contrib/completions/bash/. # copy contrib folder to origin cp -r ../%{con_repo}-%{con_commit}/init contrib/. # copy docs/admin and docs/man to origin @@ -682,6 +682,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Wed Oct 14 2015 jchaloup - 1.1.0-0.41.alpha1.gite9a6ef1 +- Bump to origin upstream e9a6ef1cd4c29d45730289a497d18b19d7ba450d + related: #1211266 + * Fri Oct 09 2015 jchaloup - 1.1.0-0.40.alpha1.git5f38cb0 - Add missing short option for --server of kubectl - Update unit-test-subpackage (only test-cmd.sh atm) diff --git a/sources b/sources index 006243f..9b8bf7b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -ccc3017634086d42f88daa64893e7ffd origin-5f38cb0.tar.gz 869f5d20b3671ef89a6827ec56df41aa kubernetes-86b4e77.tar.gz 0371c28371664eda4fcf61c3f5911166 contrib-99f38cc.tar.gz +46d71141f7d47a0c22535d4c88093cc7 origin-e9a6ef1.tar.gz