Merge lp:~gandelman-a/ubuntu/oneiric/glance/lp784837 into lp:ubuntu/oneiric/glance

[Adam Gandelman]

Removed shell output redirects in upstart jobs to ensure glance services have correct permissions to write to the default log files. Its probably a bad idea to have log files hard-coded here, anyway. Should close bug #784837.

[Martin Pitt (pitti)]

This looks fine, thanks!

review: Approve

[Martin Pitt (pitti)]

Hmm, seems someone already merged and uploaded this without updating the branch or bug.

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-24 14:05:52 +0000
+++ debian/changelog	2011-06-29 22:51:45 +0000
@@ -1,3 +1,10 @@
+glance (2011.3~d2~20110621.141-0ubuntu2) UNRELEASED; urgency=low
+
+  * Remove shell redirects in upstart jobs to ensure correct permissions
+    on logfiles. (LP: #784837)
+
+ -- Adam Gandelman <[e-mail]>  Wed, 29 Jun 2011 11:18:14 -0700
+
 glance (2011.3~d2~20110621.141-0ubuntu1) oneiric; urgency=low
 
   * New upstream release.

=== modified file 'debian/glance.glance-api.upstart'
--- debian/glance.glance-api.upstart	2011-05-25 15:57:15 +0000
+++ debian/glance.glance-api.upstart	2011-06-29 22:51:45 +0000
@@ -6,4 +6,4 @@
 
 respawn
 
-exec su -c "glance-api" glance >> /var/log/glance/api.log 2>&1
+exec su -c "glance-api" glance

=== modified file 'debian/glance.glance-registry.upstart'
--- debian/glance.glance-registry.upstart	2011-05-25 15:57:15 +0000
+++ debian/glance.glance-registry.upstart	2011-06-29 22:51:45 +0000
@@ -6,4 +6,4 @@
 
 respawn
 
-exec su -c "glance-registry" glance >> /var/log/glance/registry.log 2>&1
+exec su -c "glance-registry" glance