From dae0013c8c30cf7d5605a8e73817b7ca43be5b14 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 07 2018 09:34:09 +0000 Subject: import etcd-3.2.15-1.el7 --- diff --git a/.etcd.metadata b/.etcd.metadata index 7db8542..0f67e93 100644 --- a/.etcd.metadata +++ b/.etcd.metadata @@ -1,2 +1,2 @@ -f6324e5a0ec505cd64225fea0d6c8a6214c43e7d SOURCES/etcd-1e1dbb2.tar.gz -9fb10ddc582753a5b5935215247153df3a4fedcd SOURCES/man-3.2.11-1.tar.gz +8259cb1dd3efc293bde64fab116936b2b1f93c13 SOURCES/etcd-1b3ac99.tar.gz +3ece62b2e2d5536c32f06a2a0f6d89d5d40e92a6 SOURCES/man-3.2.15-1.tar.gz diff --git a/.gitignore b/.gitignore index 5009594..6f5a661 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/etcd-1e1dbb2.tar.gz -SOURCES/man-3.2.11-1.tar.gz +SOURCES/etcd-1b3ac99.tar.gz +SOURCES/man-3.2.15-1.tar.gz diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf index fd3d934..e7275d3 100644 --- a/SOURCES/etcd.conf +++ b/SOURCES/etcd.conf @@ -11,6 +11,10 @@ ETCD_NAME="default" #ETCD_HEARTBEAT_INTERVAL="100" #ETCD_ELECTION_TIMEOUT="1000" #ETCD_QUOTA_BACKEND_BYTES="0" +#ETCD_MAX_REQUEST_BYTES="1572864" +#ETCD_GRPC_KEEPALIVE_MIN_TIME="5s" +#ETCD_GRPC_KEEPALIVE_INTERVAL="2h0m0s" +#ETCD_GRPC_KEEPALIVE_TIMEOUT="20s" # #[Clustering] #ETCD_INITIAL_ADVERTISE_PEER_URLS="http://localhost:2380" diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec index 957d1f8..a13d0d1 100644 --- a/SPECS/etcd.spec +++ b/SPECS/etcd.spec @@ -11,7 +11,7 @@ %endif %if ! 0%{?gobuild:1} -%define gobuild(o:) go build -buildmode pie -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro'" -a -v -x %{?**}; +%define gobuild(o:) go build -buildmode pie -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro,-z,now'" -a -v -x %{?**}; %endif %global provider github @@ -21,13 +21,13 @@ # https://github.com/coreos/etcd %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 1e1dbb23924672c6cd72c62ee0db2b45f778da71 +%global commit 1b3ac99e8a431b381e633802cc42fe70e663baf5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global system_name etcd Name: etcd -Version: 3.2.11 +Version: 3.2.15 Release: 1%{?dist} Summary: A highly-available key value store for shared configuration License: ASL 2.0 @@ -445,6 +445,11 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh %endif %changelog +* Mon Jan 29 2018 Jan Chaloupka - 3.2.15-1 +- Update to 3.2.15 + resolves: #1539670 + resolves: #1378706 + * Wed Dec 06 2017 Jan Chaloupka - 3.2.11-1 - Update to 3.2.11 related: #1514612