]> 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: ae319ee 7a335ed)
Merge remote-tracking branch 'origin/master' into merge-master-into-pecan
authorDoug Wiegley <dougw@a10networks.com>
Wed, 2 Sep 2015 21:40:45 +0000 (15:40 -0600)
committerDoug Wiegley <dougw@a10networks.com>
Wed, 2 Sep 2015 21:40:51 +0000 (15:40 -0600)
Change-Id: I28d09f217464c1abef6fc38907071a65c17da86c

1  2 
neutron/api/extensions.py patch | diff1 | diff2 | blob | history
requirements.txt patch | diff1 | diff2 | blob | history

diff --cc neutron/api/extensions.py
Simple merge
diff --cc requirements.txt
Simple merge