From 321efc048a55546f77148a808042987fc3ddb798 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 06 2016 17:24:18 +0000
Subject: import etcd3-3.0.14-2.el7


---

diff --git a/.etcd3.metadata b/.etcd3.metadata
index fd232ef..4b37f26 100644
--- a/.etcd3.metadata
+++ b/.etcd3.metadata
@@ -1 +1 @@
-c9dd34702baaeadc95be588401df14a3f877d5c5 SOURCES/etcd-24a90ba.tar.gz
+f8b0c349f8411169e29adadfb96b6cd481cd9991 SOURCES/etcd-8a37349.tar.gz
diff --git a/.gitignore b/.gitignore
index ac0abda..e0780f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/etcd-24a90ba.tar.gz
+SOURCES/etcd-8a37349.tar.gz
diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf
index bc7bbbc..6f90c25 100644
--- a/SOURCES/etcd.conf
+++ b/SOURCES/etcd.conf
@@ -22,6 +22,8 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379"
 #ETCD_DISCOVERY_SRV=""
 #ETCD_DISCOVERY_FALLBACK="proxy"
 #ETCD_DISCOVERY_PROXY=""
+#ETCD_STRICT_RECONFIG_CHECK="false"
+#ETCD_AUTO_COMPACTION_RETENTION="0"
 #
 #[proxy]
 #ETCD_PROXY="off"
@@ -36,10 +38,12 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379"
 #ETCD_KEY_FILE=""
 #ETCD_CLIENT_CERT_AUTH="false"
 #ETCD_TRUSTED_CA_FILE=""
+#ETCD_AUTO_TLS="false"
 #ETCD_PEER_CERT_FILE=""
 #ETCD_PEER_KEY_FILE=""
 #ETCD_PEER_CLIENT_CERT_AUTH="false"
 #ETCD_PEER_TRUSTED_CA_FILE=""
+#ETCD_PEER_AUTO_TLS="false"
 #
 #[logging]
 #ETCD_DEBUG="false"
diff --git a/SPECS/etcd3.spec b/SPECS/etcd3.spec
index d9fa63e..db1b621 100644
--- a/SPECS/etcd3.spec
+++ b/SPECS/etcd3.spec
@@ -31,14 +31,14 @@
 # https://github.com/coreos/etcd
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          24a90baff8dd153a8481876fb27db64d7ec7e3c7
+%global commit          8a37349097a592db79ba3087f3cae9cd4b0af21c
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global system_name     etcd
 
 Name:		etcd3
-Version:	3.0.3
-Release:	1%{?dist}
+Version:	3.0.14
+Release:	2%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
 URL:		https://%{provider_prefix}
@@ -435,6 +435,35 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh
 %endif
 
 %changelog
+* Tue Nov 15 2016 Avesh Agarwal <avagarwa@redhat.com> - 3.0.14-2
+- Resolves: #1395359 etcd3 should not obsolete etcd
+
+* Mon Nov 07 2016 jchaloup <jchaloup@redhat.com> - 3.0.14-1
+- Update to v3.0.14
+  related: #1386963
+
+* Thu Oct 27 2016 jchaloup <jchaloup@redhat.com> - 3.0.13-1
+- Update to v3.0.13
+  related: #1386963
+
+* Fri Oct 21 2016 jchaloup <jchaloup@redhat.com> - 3.0.12-3
+- etcdctl: fix migrate in outputing client.Node to json
+  resolves: #1386963
+
+* Tue Oct 18 2016 jchaloup <jchaloup@redhat.com> - 3.0.12-2
+- Replace etcd with etcd3 when upgrading
+  resolves: #1384161
+
+* Thu Oct 13 2016 jchaloup <jchaloup@redhat.com> - 3.0.12-1
+- Update to v3.0.12
+
+* Thu Oct 06 2016 jchaloup <jchaloup@redhat.com> - 3.0.10-1
+- Update to v3.0.10
+
+* Fri Sep 23 2016 jchaloup <jchaloup@redhat.com> - 3.0.3-2
+- Extend etcd.conf with new flags
+  resolves: #1378706
+
 * Fri Jul 22 2016 jchaloup <jchaloup@redhat.com> - 3.0.2-1
 - Update to v3.0.3
   related: #1347499