Squashed commit of the following:
commit c4a816135d5c55af5079432b7c57a5ba8e40752d
Author: Jan Chaloupka <jchaloup@redhat.com>
Date: Mon Mar 30 13:01:08 2015 +0200
Add debug info
- related: #1165688
commit b6697a87ec76c84b34b115ba75a717f45a7475a5
Author: Eric Paris <eparis@redhat.com>
Date: Thu Mar 5 14:19:40 2015 -0500
Do not use {} around FLANNEL_OPTIONS so one can pass more than 1 option
commit 1e702c042dfad066e6b1572dde05ebd294d46d33
Author: Jan Chaloupka <jchaloup@redhat.com>
Date: Fri Feb 20 10:16:19 2015 +0100
Update [Build]Requires for go-etcd package
commit 3b954b37fa5e65278a60e1945d3180c859a13be3
Author: Eric Paris <eparis@redhat.com>
Date: Wed Jan 21 14:36:10 2015 -0500
Add generator more like upstream wants to use, use ExecStartPost
(https://github.com/coreos/flannel/pull/85)
commit 8d0e6c275d6eb3c779d4f3f5e29b84dd865796b2
Author: Eric Paris <eparis@redhat.com>
Date: Tue Jan 20 18:34:18 2015 -0500
Add intermediate service file to resolve flannel to docker race
commit 31ac48bc8c1d4568f2cafa4dbde64f96bc78d069
Author: Peter Lemenkov <lemenkov@gmail.com>
Date: Wed Jan 21 00:04:08 2015 +0300
Change (Build)Requires accordning to the recent changes
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>