Eucalyptus

Merge lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config into lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu-karmic

  1. k-fix-email-config
  2. Merge into ubuntu-karmic
Proposed by Mathias Gug
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config
Merge into: lp://qastaging/~ubuntu-core-dev/eucalyptus/ubuntu-karmic
Diff against target: 36 lines
2 files modified
debian/changelog (+2/-0)
debian/eucalyptus-cloud.postinst (+13/-0)
To merge this branch: bzr merge lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config
Reviewer Review Type Date Requested Status
Dustin Kirkland  Needs Fixing
Review via email: mp+14336@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

Hrm, you have merge conflict messages in your diff. Is that intended?

review: Needs Fixing
lp://qastaging/~mathiaz/eucalyptus/k-fix-email-config updated
721. By Mathias Gug

Merge karmic branch.

722. By Mathias Gug

Merge karmic branch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2009-11-03 16:05:34 +0000
+++ debian/changelog 2009-11-03 17:54:13 +0000
@@ -19,6 +19,8 @@
19 instead of publishing the CC IP address via the service name (LP: #458904).19 instead of publishing the CC IP address via the service name (LP: #458904).
20 * debian/avahi-daemon.conf: ship a specific avahi-daemon configuration file20 * debian/avahi-daemon.conf: ship a specific avahi-daemon configuration file
21 that doesn't publish IP addresses by default. (LP: #458904).21 that doesn't publish IP addresses by default. (LP: #458904).
22 * debian/eucalyptus-cloud.postinst: Fix postfix configuration to accept
23 confirmation emails sent by eucalyptus (LP: #459101)
2224
23 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +020025 -- Thierry Carrez <thierry.carrez@ubuntu.com> Tue, 20 Oct 2009 12:26:19 +0200
2426
2527
=== modified file 'debian/eucalyptus-cloud.postinst'
--- debian/eucalyptus-cloud.postinst 2009-09-28 02:40:40 +0000
+++ debian/eucalyptus-cloud.postinst 2009-11-03 17:54:13 +0000
@@ -7,6 +7,19 @@
7 chmod 700 /var/lib/eucalyptus/db7 chmod 700 /var/lib/eucalyptus/db
8 fi8 fi
99
10 # Update postfix configuration to accept confirmation emails sent
11 # by eucalyptus - LP: #459101
12 if dpkg --compare-versions "$2" lt 1.6~bzr931-0ubuntu7.1
13 then
14 if which postconf > /dev/null; then
15 postconf -# "mynetworks"
16 postconf -e "mynetworks_style=host"
17 [ -x /usr/sbin/invoke-rc.d ] && INIT="/usr/sbin/invoke-rc.d postfix" \
18 || INIT="/etc/init.d/postfix"
19 ${INIT} reload
20 fi
21 fi
22
10 if [ -e /etc/init/eucalyptus.conf ]; then23 if [ -e /etc/init/eucalyptus.conf ]; then
11 restart eucalyptus || :24 restart eucalyptus || :
12 fi25 fi

Subscribers

People subscribed via source and target branches

to all changes: