]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commitdiff
Code Review / openstack-build / neutron-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 89bdc04 288432e)
Merge tag '2014.1.rc2' into debian/icehouse
authorThomas Goirand <thomas@goirand.fr>
Wed, 9 Apr 2014 15:44:22 +0000 (23:44 +0800)
committerThomas Goirand <thomas@goirand.fr>
Wed, 9 Apr 2014 15:44:22 +0000 (23:44 +0800)
Neutron icehouse-rc2 milestone (2014.1.rc2)

Conflicts:
neutron/tests/unit/vmware/extensions/test_networkgw.py

Change-Id: I9e1d8789e01c5e35f26fa732b177dffd6caac635


Trivial merge