git.ipfire.org Git - thirdparty/systemd.git/commit

]> git.ipfire.org Git - thirdparty/systemd.git/commit

projects / thirdparty / systemd.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4306d66 90365b0)

author	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 6 Aug 2015 01:01:06 +0000 (21:01 -0400)
committer	Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
	Thu, 6 Aug 2015 01:02:41 +0000 (21:02 -0400)
commit	73974f6768ef5314a572eb93f5cfc7f0f29c9549
tree	e95c0a5626290c79e7c31ac143e6c75a0f167d9d	tree \| snapshot
parent	4306d66f594722a2fe44b034d3c68bfb864c6a76	commit \| diff
parent	90365b043ab6a0d8100e0c37dea4ca9d6fdb4695	commit \| diff

Merge branch 'hostnamectl-dot-v2'

Manual merge of https://github.com/systemd/systemd/pull/751.

13 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
Makefile.am	diff1 \|	diff2 \|	blob \| history
src/basic/util.c	diff1 \|	diff2 \|	blob \| history
src/basic/util.h	diff1 \|	diff2 \|	blob \| history
src/firstboot/firstboot.c	diff1 \|	diff2 \|	blob \| history
src/import/pull-dkr.c	diff1 \|	diff2 \|	blob \| history
src/journal/journalctl.c	diff1 \|	diff2 \|	blob \| history
src/libsystemd-network/sd-dhcp-lease.c	diff1 \|	diff2 \|	blob \| history
src/locale/localed.c	diff1 \|	diff2 \|	blob \| history
src/network/networkd-network.c	diff1 \|	diff2 \|	blob \| history
src/nspawn/nspawn.c	diff1 \|	diff2 \|	blob \| history
src/test/test-hostname-util.c	\|	diff2 \|	blob \| history
src/test/test-util.c	diff1 \|	diff2 \|	blob \| history

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