From: Thomas Goirand <thomas@goirand.fr>
Date: Wed, 24 Dec 2014 07:11:15 +0000 (+0800)
Subject: Merge tag '2015.1_b1' into debian/kilo
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=da9cd317fad08b77cbdec6edf71e5ceed1160fd6;p=openstack-build%2Fneutron-build.git

Merge tag '2015.1_b1' into debian/kilo

Neutron kilo-1 milestone (2015.1.0b1)

Conflicts:
	neutron/plugins/ryu/ryu_neutron_plugin.py
---

da9cd317fad08b77cbdec6edf71e5ceed1160fd6