Merge lp:~peter-petrakis/serverguide/lp-1057071 into lp:~ubuntu-core-doc/serverguide/quantal

Proposed by Peter Petrakis
Status: Merged
Approved by: Peter Matulis
Approved revision: 100
Merged at revision: 100
Proposed branch: lp:~peter-petrakis/serverguide/lp-1057071
Merge into: lp:~ubuntu-core-doc/serverguide/quantal
Diff against target: 11 lines (+1/-1)
1 file modified
serverguide/C/dm-multipath.xml (+1/-1)
To merge this branch: bzr merge lp:~peter-petrakis/serverguide/lp-1057071
Reviewer Review Type Date Requested Status
Peter Matulis Approve
Review via email:
To post a comment you must log in.
Revision history for this message
Peter Matulis (petermatulis) wrote :

Looks good to me.

review: Approve
Revision history for this message
Doug Smythies (dsmythies) wrote :

If this was approved, why wasn't it merged? Now it doesn't appear in the Raring branch. Will it appear by itself once approved, or will it have to be re-done for raring?

Revision history for this message
Peter Petrakis (peter-petrakis) wrote :

There's been a real disconnect in getting simple doc changes done. Don't get me started on updating
the actual rendered part of the documentation. At this point I'm letting this go, first it was get this
into quantal and I did, now raring is up and I have the same problem all over again, it's not in the current
release. None of the changes that have been merged into precise have actually been pushed into
the rendered copy.

I can write an entire chapter for the server guide but I can't get a one line change in.

Revision history for this message
Doug Smythies (dsmythies) wrote :

O.K. I merged this. If it does not automatically go into the Raring version, I'll do the same edit there myself.

Revision history for this message
Doug Smythies (dsmythies) wrote :

Oh my goodness, what have I done!!!
This Merge proposal is backwards from the actual LaunchPad bug report.
It takes something that was right and makes it wrong.
So, it should have been rejected instead of approved.
When I originally checked raring, I did so against the bug report.
When I checked raring this morning, I did so against this MP, so now have two messes to clean up.
The one that Serge did for precise was the right way around.

Revision history for this message
Doug Smythies (dsmythies) wrote :

This has been fixed in both quantal (rev 102) and raring (rev 103).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'serverguide/C/dm-multipath.xml'
2--- serverguide/C/dm-multipath.xml 2012-09-26 18:15:35 +0000
3+++ serverguide/C/dm-multipath.xml 2012-12-12 15:04:23 +0000
4@@ -1267,7 +1267,7 @@
5 -r`/kernel/drivers/scsi/device_handler/ </filename></emphasis>. The
6 requisite module should be integrated into the initrd to ensure the
7 necessary discovery and failover-failback capacity is available during
8- boot time. Example,<screen># echo scsi_dh_alua &gt;&gt; /etc/initramfs-tools/modules ## append module to file
9+ boot time. Example,<screen># cat scsi_dh_alua &gt;&gt; /etc/initramfs-tools/modules ## append module to file
10 # update-initramfs -u -k all</screen></para>
11 </note>


People subscribed via source and target branches