summaryrefslogtreecommitdiff
path: root/src/resolve-host
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-08-25 23:58:40 +0200
committerDaniel Mack <github@zonque.org>2015-08-25 23:58:40 +0200
commit487ebe593ccc5e02de31130eb2de05478d1b53b0 (patch)
treef302ced9dc6734863f696c8addeb314d788678c6 /src/resolve-host
parent6a18bd1616ceeeb7b3eebf265dd10113c0c8811e (diff)
parentc1521918b48f45a316f0bd034976809ae0ce4dd8 (diff)
Merge pull request #1039 from poettering/nspawn-machine-template
nspawn: make sure --template= and --machine= my be combined
Diffstat (limited to 'src/resolve-host')
0 files changed, 0 insertions, 0 deletions