From 4993b8e3d6f6c4fb3ab96cc0e346af874a9845dc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2015 00:34:55 +0000
Subject: import flannel-0.2.0-10.el7


---

diff --git a/SOURCES/flanneld.sysconf b/SOURCES/flanneld.sysconf
index 082e335..2b4d7b8 100644
--- a/SOURCES/flanneld.sysconf
+++ b/SOURCES/flanneld.sysconf
@@ -1,7 +1,7 @@
 # Flanneld configuration options  
 
 # etcd url location.  Point this to the server where etcd runs
-FLANNEL_ETCD="http://127.0.0.1:4001"
+FLANNEL_ETCD="http://127.0.0.1:2379"
 
 # etcd config key.  This is the configuration key that flannel queries
 # For address range assignment
diff --git a/SPECS/flannel.spec b/SPECS/flannel.spec
index 1539c50..51e12d8 100644
--- a/SPECS/flannel.spec
+++ b/SPECS/flannel.spec
@@ -9,7 +9,7 @@
 
 Name:           flannel 
 Version:        0.2.0
-Release:        7%{?dist}
+Release:        10%{?dist}
 Summary:        Etcd address management agent for overlay networks
 License:        ASL 2.0 
 URL:            https://%{import_path}
@@ -71,6 +71,17 @@ install -D -p -m 755 %{SOURCE4} %{buildroot}%{_libexecdir}/flannel/mk-docker-opt
 %config(noreplace) %{_sysconfdir}/sysconfig/flanneld
 
 %changelog
+* Mon Jul 20 2015 jchaloup <jchaloup@redhat.com> - 0.2.0-10
+- Revert changes not for AH 7.1.4
+- Change etcd port from 4001 to 2379
+  resolves: #1244626
+
+* Fri Jul 10 2015 jchaloup <jchaloup@redhat.com> - 0.2.0-9
+- Change flannel prefix from /coreos.com/network to /atomic.io/network
+
+* Fri Jul 10 2015 jchaloup <jchaloup@redhat.com> - 0.2.0-8
+- Add After=etcd.service to flanneld.service
+
 * Sun Mar 08 2015 jchaloup <jchaloup@redhat.com> - 0.2.0-7
 - flanneld fails to start on boot
   resolves: #1184579