Ubuntu
glance package

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

  1. Precise (12.04)
  2. pasteconfigs
  3. Merge into essex
Proposed by Adam Gandelman on 2012-01-20
Status: Merged
Approved by: Chuck Short on 2012-01-20
Approved revision: 106
Merged at revision: 106
Proposed branch: lp:~gandelman-a/ubuntu/precise/glance/pasteconfigs
Merge into: lp:~ubuntu-server-dev/glance/essex
Diff against target: 35 lines (+11/-0)
3 files modified
debian/changelog (+7/-0)
debian/glance-api.install (+3/-0)
debian/glance-registry.install (+1/-0)
To merge this branch: bzr merge lp:~gandelman-a/ubuntu/precise/glance/pasteconfigs
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2012-01-20 Pending
Review via email: mp+89479@code.launchpad.net

Description of the Change

Adds the required paste configs for each service now that they've been split out in to individuals.

To post a comment you must log in.
Chuck Short (zulcss) wrote :

lgtm

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-13 09:50:51 +0000
3+++ debian/changelog 2012-01-20 19:03:28 +0000
4@@ -1,3 +1,10 @@
5+glance (2012.1~e3~20120112.1060-0ubuntu2) UNRELEASED; urgency=low
6+
7+ * debian/glance-api.install, glance-registry.install: Install
8+ new paste configs that have been split among servers.
9+
10+ -- Adam Gandelman <adamg@canonical.com> Fri, 20 Jan 2012 10:25:06 -0800
11+
12 glance (2012.1~e3~20120112.1060-0ubuntu1) precise; urgency=low
13
14 [Chuck Short]
15
16=== modified file 'debian/glance-api.install'
17--- debian/glance-api.install 2011-12-15 15:21:06 +0000
18+++ debian/glance-api.install 2012-01-20 19:03:28 +0000
19@@ -5,5 +5,8 @@
20 usr/bin/glance-cache-cleaner
21 usr/bin/glance-cache-pruner
22 etc/glance-api.conf etc/glance
23+etc/glance-api-paste.ini etc/glance
24 etc/glance-cache.conf etc/glance
25+etc/glance-cache-paste.ini etc/glance
26 etc/glance-scrubber.conf etc/glance
27+etc/glance-scrubber-paste.ini etc/glance
28
29=== modified file 'debian/glance-registry.install'
30--- debian/glance-registry.install 2011-12-15 15:21:06 +0000
31+++ debian/glance-registry.install 2012-01-20 19:03:28 +0000
32@@ -1,2 +1,3 @@
33 usr/bin/glance-registry
34 etc/glance-registry.conf etc/glance
35+etc/glance-registry-paste.ini etc/glance

Subscribers

People subscribed via source and target branches