Glance

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

  1. policyjson
  2. Merge into essex
Proposed by Adam Gandelman
Status: Merged
Merged at revision: 109
Proposed branch: lp:~gandelman-a/glance/policyjson
Merge into: lp:~ubuntu-server-dev/glance/essex
Diff against target: 22 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
debian/glance-api.install (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/glance/policyjson
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+89745@code.launchpad.net

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-01-20 19:38:33 +0000
3+++ debian/changelog 2012-01-23 17:34:26 +0000
4@@ -1,3 +1,9 @@
5+glance (2012.1~e3~20120120.1206-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/glance-api.install: Add policy.json
8+
9+ -- Adam Gandelman <adamg@canonical.com> Mon, 23 Jan 2012 09:22:44 -0800
10+
11 glance (2012.1~e3~20120120.1206-0ubuntu1) precise; urgency=low
12
13 [Chuck Short]
14
15=== modified file 'debian/glance-api.install'
16--- debian/glance-api.install 2012-01-20 18:44:25 +0000
17+++ debian/glance-api.install 2012-01-23 17:34:26 +0000
18@@ -10,3 +10,4 @@
19 etc/glance-cache-paste.ini etc/glance
20 etc/glance-scrubber.conf etc/glance
21 etc/glance-scrubber-paste.ini etc/glance
22+etc/policy.json etc/glance

Subscribers

People subscribed via source and target branches