From: Daniel Mack Date: Tue, 25 Aug 2015 21:58:40 +0000 (+0200) Subject: Merge pull request #1039 from poettering/nspawn-machine-template X-Git-Tag: v225~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=487ebe593ccc5e02de31130eb2de05478d1b53b0;p=platform%2Fupstream%2Fsystemd.git Merge pull request #1039 from poettering/nspawn-machine-template nspawn: make sure --template= and --machine= my be combined --- 487ebe593ccc5e02de31130eb2de05478d1b53b0