chiark / gitweb /
~mdw / tripe / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 904828e a78cb34)
Merge branch 'mdw/svc-merge'
authorMark Wooding <mdw@distorted.org.uk>
Tue, 28 Jan 2014 15:27:27 +0000 (15:27 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Tue, 28 Jan 2014 15:27:27 +0000 (15:27 +0000)
commit51113adb98c4d82ab799ab38ea463427d0780daa
treefec9255dfef7ad490b5222ac44d10f029536162etree | snapshot
parent904828efba2a3deadc45b46764e43b1e83aec46ecommit | diff
parenta78cb349def3ae27e508b591d05b952006de4b12commit | diff
Merge branch 'mdw/svc-merge'

* mdw/svc-merge:
  debian/tripe-peer-services.postinst: Retire the old `watch' service.
  Merge the `connect' and `watch' services.
  svc/watch.in: Rename some of the functions.
  svc/watch.in: Use the `Peer' object from `connect' to carry information.
debian/tripe-peer-services.postinst diff1 | diff2 | blob | history
Trivial IP Encryption: a simple VPN