]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
projects / thirdparty / systemd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a18bd1 c152191)
Merge pull request #1039 from poettering/nspawn-machine-template
authorDaniel Mack <github@zonque.org>
Tue, 25 Aug 2015 21:58:40 +0000 (23:58 +0200)
committerDaniel Mack <github@zonque.org>
Tue, 25 Aug 2015 21:58:40 +0000 (23:58 +0200)
nspawn: make sure --template= and --machine= my be combined


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.