chiark / gitweb /
~mdw / firewall / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3dc88dd 2b5ca00)
Merge branch 'upstream' into tmp
authorMark Wooding <mdw@distorted.org.uk>
Mon, 11 May 2015 14:26:04 +0000 (15:26 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Mon, 11 May 2015 14:26:04 +0000 (15:26 +0100)
commit664fb931eebc051998e1a053c50a949405577676
tree27b51a7acc0a7055637b86a0aa1b48a45a887c05tree | snapshot
parent3dc88ddc002964ace632e757ee7161fa26715e0ecommit | diff
parent2b5ca0033749741dbbe22eed9bc12b4f64199b0dcommit | diff
Merge branch 'upstream' into tmp

* upstream:
  functions.m4 (ntpclient): Handle NTP servers with IPv6 addresses.
  local.m4: Allow IPv6 ping separately.
  telecaster.m4: External SMTP service for mailing lists.
  local.mk: Remove orange and mango.
  jem.m4, vampire.m4: Cull some external services.
  local.m4: gibson now uses explicit VLAN tagging.
  functions.m4: Only call `allow-non-init-frag' on fragments.

Conflicts:
local.m4
local.mk
local.m4 diff1 | diff2 | blob | history
Firewall scripts for distorted.org.uk.