Merge lp:~openstack-ubuntu-testing/glance/precise-essex-proposed into lp:~ubuntu-server-dev/glance/essex

Proposed by Adam Gandelman
Status: Merged
Merged at revision: 123
Proposed branch: lp:~openstack-ubuntu-testing/glance/precise-essex-proposed
Merge into: lp:~ubuntu-server-dev/glance/essex
Diff against target: 31 lines (+10/-3)
2 files modified
debian/changelog (+6/-0)
debian/glance-common.postinst (+4/-3)
To merge this branch: bzr merge lp:~openstack-ubuntu-testing/glance/precise-essex-proposed
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+97966@code.launchpad.net
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-03-09 16:33:15 +0000
3+++ debian/changelog 2012-03-16 19:14:19 +0000
4@@ -1,3 +1,9 @@
5+glance (2012.1~rc1~20120316.1354-0ubuntu1) precise; urgency=low
6+
7+ * New upstream release.
8+
9+ -- Adam Gandelman <adamg@canonical.com> Fri, 16 Mar 2012 11:37:33 -0700
10+
11 glance (2012.1~rc1~20120309.1315-0ubuntu1) precise; urgency=low
12
13 * New upstream version.
14
15=== modified file 'debian/glance-common.postinst'
16--- debian/glance-common.postinst 2011-12-16 19:26:31 +0000
17+++ debian/glance-common.postinst 2012-03-16 19:14:19 +0000
18@@ -12,9 +12,10 @@
19 then
20 adduser --system --home /var/lib/glance --ingroup glance --no-create-home --shell /bin/false glance
21 fi
22- chown glance:glance -R /var/lib/glance/ /var/log/glance/ /etc/glance/
23- chmod 0700 /etc/glance/ /var/log/glance/
24+ chown -R glance:adm /var/log/glance/
25+ chmod 0750 /var/log/glance/
26+ chown glance:glance -R /var/lib/glance/ /etc/glance/
27+ chmod 0700 /etc/glance/
28 fi
29
30-
31 #DEBHELPER#

Subscribers

People subscribed via source and target branches