Merge lp:~gandelman-a/glance/policyjson into lp:~ubuntu-server-dev/glance/essex

[Adam Gandelman]

Like nova, glance-api now requires a policy.json in /etc/glance

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-20 19:38:33 +0000
+++ debian/changelog	2012-01-23 17:34:26 +0000
@@ -1,3 +1,9 @@
+glance (2012.1~e3~20120120.1206-0ubuntu2) UNRELEASED; urgency=low
+
+  * debian/glance-api.install: Add policy.json
+
+ -- Adam Gandelman <[e-mail]>  Mon, 23 Jan 2012 09:22:44 -0800
+
 glance (2012.1~e3~20120120.1206-0ubuntu1) precise; urgency=low
 
   [Chuck Short]
 
=== modified file 'debian/glance-api.install'
--- debian/glance-api.install	2012-01-20 18:44:25 +0000
+++ debian/glance-api.install	2012-01-23 17:34:26 +0000
@@ -10,3 +10,4 @@
 etc/glance-cache-paste.ini etc/glance
 etc/glance-scrubber.conf etc/glance
 etc/glance-scrubber-paste.ini etc/glance
+etc/policy.json etc/glance