From: Levente Kálé <levente.kale@nokia.com>
Date: Tue, 15 Oct 2019 12:09:36 +0000 (+0000)
Subject: Merge "CVE-2019-16276 Vulnerability fix."
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-etcd.git;a=commitdiff_plain;h=0f1d37be10ab1ae9b9d96b7bf1554b7297d13160;hp=-c

Merge "CVE-2019-16276 Vulnerability fix."
---

0f1d37be10ab1ae9b9d96b7bf1554b7297d13160
diff --combined caas-etcd.spec
index 5a68a36,941a3b9..84a0d21
--- a/caas-etcd.spec
+++ b/caas-etcd.spec
@@@ -15,8 -15,8 +15,8 @@@
  %define COMPONENT etcd
  %define RPM_NAME caas-%{COMPONENT}
  %define RPM_MAJOR_VERSION 3.4.0
- %define RPM_MINOR_VERSION 0
- %define go_version 1.12.9
+ %define RPM_MINOR_VERSION 1
+ %define go_version 1.12.10
  %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
  %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
  %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
@@@ -27,7 -27,7 +27,7 @@@ Release:        %{RPM_MINOR_VERSION}%{?
  Summary:        Containers as a Service %{COMPONENT} component
  License:        %{_platform_license} and MIT license and BSD and Apache License and Lesser General Public License
  URL:            https://github.com/etcd-io/etcd
 -BuildArch:      x86_64
 +BuildArch:      %{_arch}
  Vendor:         %{_platform_vendor} and etcd-io/etcd unmodified
  Source0:        %{name}-%{version}.tar.gz