~ubuntu-branches/ubuntu/wily/netscript-2.4/wily-proposed

Viewing all changes in revision 23.

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft
  • Date: 2014-01-06 14:08:24 UTC
  • mfrom: (17.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20140106140824-0jdyn9q1wcmgvq1x
Tags: 5.3.0ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control: add isc-dhcp-client to Depends:
  - debian/rules: reinstate the netscript-2.4-upstart support
  - upstart: start netscript on 'or container', to let us optimize the
    udevtrigger job.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: