From c1e14ee281ded70e0ee2297896495aada82bc46c Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Jun 02 2015 06:40:56 +0000 Subject: Bump to upstream 5520386b180d3ddc4fa7b7dfe6f52642cc0c25f3 - related: #1211266 --- diff --git a/.gitignore b/.gitignore index caf2dc0..ef95cd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kubernetes-0bb78fe.tar.gz +/kubernetes-5520386.tar.gz diff --git a/kubernetes.spec b/kubernetes.spec index bb79f3b..19b142f 100644 --- a/kubernetes.spec +++ b/kubernetes.spec @@ -10,7 +10,7 @@ %global repo kubernetes # https://github.com/GoogleCloudPlatform/kubernetes %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit 0bb78fe6c53ce38198cc3805c78308cdd4805ac8 +%global commit 5520386b180d3ddc4fa7b7dfe6f52642cc0c25f3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) #I really need this, otherwise "version_ldflags=$(kube::version_ldflags)" @@ -20,7 +20,7 @@ Name: kubernetes Version: 0.18.0 -Release: 0.1.git%{shortcommit}%{?dist} +Release: 0.2.git%{shortcommit}%{?dist} Summary: Container cluster management License: ASL 2.0 URL: %{import_path} @@ -71,8 +71,6 @@ Provides: golang(%{import_path}/pkg/api/rest/resttest) = %{version}-%{release} Provides: golang(%{import_path}/pkg/api/testapi) = %{version}-%{release} Provides: golang(%{import_path}/pkg/api/testing) = %{version}-%{release} Provides: golang(%{import_path}/pkg/api/v1) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/api/v1beta1) = %{version}-%{release} -Provides: golang(%{import_path}/pkg/api/v1beta2) = %{version}-%{release} Provides: golang(%{import_path}/pkg/api/v1beta3) = %{version}-%{release} Provides: golang(%{import_path}/pkg/api/validation) = %{version}-%{release} Provides: golang(%{import_path}/pkg/apiserver) = %{version}-%{release} @@ -338,7 +336,7 @@ Kubernetes services for node host %build export KUBE_GIT_TREE_STATE="clean" export KUBE_GIT_COMMIT=%{commit} -export KUBE_GIT_VERSION=v0.18.0-71-g0bb78fe6c53ce3 +export KUBE_GIT_VERSION=v0.18.0-157-g5520386b180d3d hack/build-go.sh --use_go_build hack/build-go.sh --use_go_build cmd/kube-version-change @@ -498,6 +496,10 @@ getent passwd kube >/dev/null || useradd -r -g kube -d / -s /sbin/nologin \ %systemd_postun %changelog +* Tue Jun 02 2015 jchaloup - 0.18.0-0.2.git5520386 +- Bump to upstream 5520386b180d3ddc4fa7b7dfe6f52642cc0c25f3 + related: #1211266 + * Mon Jun 01 2015 jchaloup - 0.18.0-0.1.git0bb78fe - Bump to upstream 0bb78fe6c53ce38198cc3805c78308cdd4805ac8 related: #1211266 diff --git a/sources b/sources index 521a914..2b8d8ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9eaf4916a3891102b1aa0fa12d4ca1c kubernetes-0bb78fe.tar.gz +eb53c59788841295c009edf4e5f3497d kubernetes-5520386.tar.gz