Merge lp:~zulcss/neutron/grizzly-fix into lp:~openstack-ubuntu-testing/neutron/grizzly

[Chuck Short]

Adds two new binaries to fix a FTBFS.

[Yolanda Robla (yolanda.robla)]

Works for me

[Yolanda Robla (yolanda.robla)]

Looks OK for me

review: Approve

[James Page (james-page)]

OK - looks like I missed this one.

The metadata proxy stuff needs to reside in it own package; its unlikely to be installed with the quantum-server (which provides API services) and needs to be usable alongside the l3-agent.

review: Disapprove

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-23 15:43:16 +0000
+++ debian/changelog	2012-12-03 14:32:36 +0000
@@ -1,3 +1,11 @@
+quantum (2013.1~g2~20121201.129.g8affc36-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream version. 
+  * debian/quantum-server.install: Add quantum-ns-metadata-proxy
+    and quantum-metadata-agent
+
+ -- Chuck Short <[e-mail]>  Sat, 01 Dec 2012 12:21:02 -0600
+
 quantum (2013.1~g1-0ubuntu1) raring; urgency=low
 
   [ Adam Gandelman ]

=== modified file 'debian/quantum-server.install'
--- debian/quantum-server.install	2012-11-15 18:11:59 +0000
+++ debian/quantum-server.install	2012-12-03 14:32:36 +0000
@@ -1,2 +1,4 @@
 usr/bin/quantum-server
 usr/bin/quantum-debug
+usr/bin/quantum-ns-metadata-proxy
+usr/bin/quantum-metadata-agent