~louis/ubuntu/wily/ifenslave/merge-debian-2.7

Viewing all changes in revision 9.

  • Committer: Package Import Robot
  • Author(s): Stéphane Graber
  • Date: 2014-05-02 15:39:48 UTC
  • mfrom: (7.1.1 sid)
  • Revision ID: package-import@ubuntu.com-20140502153948-s4a3t51k67qv5ust
Tags: 2.5ubuntu1
* Merge from Debian unstable. Remaining changes:
  - Upstart event based bond bringup:
    + Drop ethernet+wifi example
    + Drop two_ethernet example
    + Update ethernet+hotplug_wifi example
    + Update two_hotplug_ethernet example
    + Update pre-up and post-down scripts for event bringup
    + Update README.Debian examples
  - Update scripts to use /run/network/ifstate instead of
    /etc/network/run/ifstate

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: