]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #3111 from poettering/nspawn-remove-veth
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 3 May 2016 17:49:20 +0000 (13:49 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 3 May 2016 17:53:00 +0000 (13:53 -0400)
1  2 
src/nspawn/nspawn.c

Simple merge