[Merge] lp:~yuningdodo/systemd/systemd.trusty-proposed.lp1313522 into lp:ubuntu/trusty-proposed/systemd

[Yu Ning]

Yu Ning has proposed merging lp:~yuningdodo/systemd/systemd.trusty-proposed.lp1313522 into lp:ubuntu/trusty-proposed/systemd.

Requested reviews:
  Ubuntu Development Team (ubuntu-dev)
Related bugs:
  Bug #1313522 in systemd (Ubuntu): "There is hibernate option even without an active swap partition"
  https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1313522

For more details, see:
https://code.launchpad.net/~yuningdodo/systemd/systemd.trusty-proposed.lp1313522/+merge/218597

Apply the patch backported by Martin Pitt for bug #1313522 to trusty-proposed.

  [Martin Pitt]
  * Advertise hibernation only if there's enough free swap. Patches backported
    from current upstream. (LP: #1313522)

-- 
https://code.launchpad.net/~yuningdodo/systemd/systemd.trusty-proposed.lp1313522/+merge/218597
Your team Ubuntu branches is subscribed to branch lp:ubuntu/trusty-proposed/systemd.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 52989 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140507/2575db62/attachment-0003.diff>