Merge tag '049' into SUSE/049

author Daniel Molkentin <dmolkentin@suse.com>

Tue, 9 Oct 2018 13:57:32 +0000 (15:57 +0200)

committer Daniel Molkentin <dmolkentin@suse.com>

Tue, 9 Oct 2018 13:57:32 +0000 (15:57 +0200)
author Daniel Molkentin <dmolkentin@suse.com>
Tue, 9 Oct 2018 13:57:32 +0000 (15:57 +0200)
committer Daniel Molkentin <dmolkentin@suse.com>
Tue, 9 Oct 2018 13:57:32 +0000 (15:57 +0200)
diff --cc Makefile
Simple merge
diff --cc modules.d/00warpclock/module-setup.sh

index 79d59f0db546565a2af14f9b13f553e34372e1eb,ea1348ed9b021ea260c56506f553f22146bd28dd..ea1348ed9b021ea260c56506f553f22146bd28dd

mode 100755,100644..100755
--- 1/modules.d/00warpclock/module-setup.sh
--- 2/modules.d/00warpclock/module-setup.sh
+++ b/modules.d/00warpclock/module-setup.sh
diff --cc modules.d/35network-legacy/dhclient-script.sh
Simple merge
diff --cc modules.d/35network-legacy/ifup.sh
Simple merge
diff --cc modules.d/95iscsi/iscsiroot.sh
Simple merge
author	Daniel Molkentin <dmolkentin@suse.com>
	Tue, 9 Oct 2018 13:57:32 +0000 (15:57 +0200)
committer	Daniel Molkentin <dmolkentin@suse.com>
	Tue, 9 Oct 2018 13:57:32 +0000 (15:57 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
modules.d/00warpclock/module-setup.sh	patch \|	diff1 \|	diff2 \|	blob \| history
modules.d/35network-legacy/dhclient-script.sh	patch \|	diff1 \|	diff2 \|	blob \| history
modules.d/35network-legacy/ifup.sh	patch \|	diff1 \|	diff2 \|	blob \| history
modules.d/95iscsi/iscsiroot.sh	patch \|	diff1 \|	diff2 \|	blob \| history