From c580667b5606cdcd3b50d1cce9e310a2a769731f08a89c60c7d8435b92184cc9 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Wed, 28 Feb 2018 10:18:59 +0000 Subject: [PATCH 1/2] Accepting request 580214 from home:mjura:branches:devel:CaaSP:Head:ControllerNode - Update to version 3.3.1: * gitignore: add ".Dockerfile-functional-tester" * Dockerfile-functional-tester: initial commit * tools/functional-tester: update README for local docker testing * hack: sync with etcd master * mvcc: restore unsynced watchers * etcdserver: improve request took too long warning * semaphore: use Go 1.9.4, update release upgrade test version * travis: use Go 1.9.4 with TARGET_GO_VERSION * hack/scripts-dev: Makefile with Go 1.9.4, 1.8.7 * version: 3.3.1 OBS-URL: https://build.opensuse.org/request/show/580214 OBS-URL: https://build.opensuse.org/package/show/devel:CaaSP:Head:ControllerNode/etcd?expand=0&rev=4 --- _service | 4 ++-- _servicedata | 4 ++++ etcd-3.2.4.tar.xz | 3 --- etcd-3.3.1.tar.xz | 3 +++ etcd.changes | 15 +++++++++++++++ etcd.spec | 4 ++-- 6 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 _servicedata delete mode 100644 etcd-3.2.4.tar.xz create mode 100644 etcd-3.3.1.tar.xz diff --git a/_service b/_service index 89606b0..505086f 100644 --- a/_service +++ b/_service @@ -4,8 +4,8 @@ https://github.com/coreos/etcd.git .git etcd - 3.2.4 - v3.2.4 + 3.3.1 + v3.3.1 enable diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..a25778b --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/coreos/etcd.git + 28f3f26c0e303392556035b694f75768d449d33d \ No newline at end of file diff --git a/etcd-3.2.4.tar.xz b/etcd-3.2.4.tar.xz deleted file mode 100644 index e5d7300..0000000 --- a/etcd-3.2.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cb423593bb4eabb52301feded3031f37a41efb2ae687db3d1f032d5d3ff9232 -size 1745352 diff --git a/etcd-3.3.1.tar.xz b/etcd-3.3.1.tar.xz new file mode 100644 index 0000000..323c178 --- /dev/null +++ b/etcd-3.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37bb3e241e545ead9093fe934ef545927ea282fd44fd3558268152e841bc82fc +size 2048848 diff --git a/etcd.changes b/etcd.changes index 106bfc3..059fc38 100644 --- a/etcd.changes +++ b/etcd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Feb 22 06:54:05 UTC 2018 - opensuse-packaging@opensuse.org + +- Update to version 3.3.1: + * gitignore: add ".Dockerfile-functional-tester" + * Dockerfile-functional-tester: initial commit + * tools/functional-tester: update README for local docker testing + * hack: sync with etcd master + * mvcc: restore unsynced watchers + * etcdserver: improve request took too long warning + * semaphore: use Go 1.9.4, update release upgrade test version + * travis: use Go 1.9.4 with TARGET_GO_VERSION + * hack/scripts-dev: Makefile with Go 1.9.4, 1.8.7 + * version: 3.3.1 + ------------------------------------------------------------------- Thu Feb 1 16:58:18 CET 2018 - ro@suse.de diff --git a/etcd.spec b/etcd.spec index ea52528..6777e2a 100644 --- a/etcd.spec +++ b/etcd.spec @@ -22,7 +22,7 @@ %endif Name: etcd -Version: 3.2.4 +Version: 3.3.1 Release: 0 Summary: Highly-available key value store for configuration and service discovery License: Apache-2.0 @@ -37,7 +37,7 @@ BuildRequires: golang-packaging BuildRequires: shadow BuildRequires: systemd-rpm-macros BuildRequires: xz -BuildRequires: golang(API) = 1.8 +BuildRequires: golang(API) = 1.9 ExcludeArch: %ix86 Requires(post): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build From 1da2ca1633f1c8ed9e6a11ea66a702a670ceaf9944f2c080eec1daddc143a848 Mon Sep 17 00:00:00 2001 From: Jordi Massaguer Date: Thu, 1 Mar 2018 14:12:19 +0000 Subject: [PATCH 2/2] Accepting request 580909 from home:jordimassaguerpla:branch:etcd_fix_br - Build require go 1.9.4 or newer, since etcd has been tested and built on that. See previous changelog. fix#go_requirement. Needed by feature#node_removal OBS-URL: https://build.opensuse.org/request/show/580909 OBS-URL: https://build.opensuse.org/package/show/devel:CaaSP:Head:ControllerNode/etcd?expand=0&rev=5 --- etcd.changes | 8 ++++++++ etcd.spec | 1 + 2 files changed, 9 insertions(+) diff --git a/etcd.changes b/etcd.changes index 059fc38..3e24c3c 100644 --- a/etcd.changes +++ b/etcd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Feb 28 10:27:43 UTC 2018 - jmassaguerpla@suse.com + +- Build require go 1.9.4 or newer, since etcd has been tested and + built on that. See previous changelog. + fix#go_requirement. + ------------------------------------------------------------------- Thu Feb 22 06:54:05 UTC 2018 - opensuse-packaging@opensuse.org @@ -12,6 +19,7 @@ Thu Feb 22 06:54:05 UTC 2018 - opensuse-packaging@opensuse.org * travis: use Go 1.9.4 with TARGET_GO_VERSION * hack/scripts-dev: Makefile with Go 1.9.4, 1.8.7 * version: 3.3.1 + Needed by feature#node_removal ------------------------------------------------------------------- Thu Feb 1 16:58:18 CET 2018 - ro@suse.de diff --git a/etcd.spec b/etcd.spec index 6777e2a..a6913d9 100644 --- a/etcd.spec +++ b/etcd.spec @@ -38,6 +38,7 @@ BuildRequires: shadow BuildRequires: systemd-rpm-macros BuildRequires: xz BuildRequires: golang(API) = 1.9 +BuildRequires: go >= 1.9.4 ExcludeArch: %ix86 Requires(post): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build