From 976a457da669007a2b5ef083515e38bc70248261 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 28 2017 15:12:34 +0000 Subject: import flannel-0.7.1-1.el7 --- diff --git a/.flannel.metadata b/.flannel.metadata index 94e7594..ee1604d 100644 --- a/.flannel.metadata +++ b/.flannel.metadata @@ -1 +1 @@ -11788a86d489c281cf53690c66cef9c7bd02c591 SOURCES/flannel-d9560b0.tar.gz +1687e75367c05f3aea2397dd4ada0cfe062dee19 SOURCES/flannel-683c6e9.tar.gz diff --git a/.gitignore b/.gitignore index 9ff375e..e74cd31 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/flannel-d9560b0.tar.gz +SOURCES/flannel-683c6e9.tar.gz diff --git a/SPECS/flannel.spec b/SPECS/flannel.spec index c468064..ba012f5 100644 --- a/SPECS/flannel.spec +++ b/SPECS/flannel.spec @@ -14,13 +14,13 @@ %global project coreos %global repo flannel %global import_path %{provider}.%{provider_tld}/%{project}/%{repo} -%global commit d9560b051b0abe92048ae5c72b5fbd71ba7b8f17 +%global commit 683c6e9eb06d0f49c43eef9ecbb777a3adaeda88 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global devel_main flannel-devel Name: flannel -Version: 0.7.0 +Version: 0.7.1 Release: 1%{?dist} Summary: Etcd address management agent for overlay networks License: ASL 2.0 @@ -36,8 +36,6 @@ Source5: flanneld-start Patch0: change-4001-to-2379-in-help-and-README.patch Patch1: change-coreos.com-network-to-atomic.io-network-in-he.patch -ExclusiveArch: %{ix86} x86_64 %{arm} - BuildRequires: golang >= 1.2.7 %if ! 0%{?with_bundled} BuildRequires: golang(code.google.com/p/goauth2/compute/serviceaccount) @@ -211,6 +209,10 @@ go test %{import_path}/subnet %endif %changelog +* Wed May 31 2017 Jan Chaloupka - 0.7.1-1 +- Update to flannel v0.7.1 + resolves: #1457094 + * Mon Feb 06 2017 Jan Chaloupka - 0.7.0-1 - Update to flannel v0.7.0 resolves: #1419750