]> 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: 86178cd eecc864)
Merge tag '2015.1_b1' into debian/kilo
authorThomas Goirand <thomas@goirand.fr>
Wed, 24 Dec 2014 07:11:15 +0000 (15:11 +0800)
committerThomas Goirand <thomas@goirand.fr>
Wed, 24 Dec 2014 07:11:15 +0000 (15:11 +0800)
Neutron kilo-1 milestone (2015.1.0b1)

Conflicts:
neutron/plugins/ryu/ryu_neutron_plugin.py

1  2 
neutron/db/db_base_plugin_v2.py patch | diff1 | diff2 | blob | history
neutron/db/l3_db.py patch | diff1 | diff2 | blob | history

diff --cc neutron/db/db_base_plugin_v2.py
Simple merge
diff --cc neutron/db/l3_db.py
Simple merge