Public Git Hosting - unleashed.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 898e205 33d05bc)

commit	f102d519462beb2ab77d80afd65567223052833e
author	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Sun, 19 May 2019 19:28:21 +0000 (19 15:28 -0400)
committer	Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
	Sun, 19 May 2019 19:28:21 +0000 (19 15:28 -0400)
tree	300f77bc6ccf7c215a6f247aeebc1a8326306828	tree \| snapshot (tar.gz zip)
parent	898e205024077368edf6325ad18c94525c7897f2	commit \| diff
parent	33d05bc1b89915cf87dec3f6f9f2d5743fc9ea70	commit \| diff

Merge illumos-gate

12 files changed:

arch/x86/kernel/dboot/dboot_startkern.c	diff1 \|	\|	blob \| history
usr/src/cmd/cmd-inet/usr.bin/dns-sd/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/cmd-inet/usr.lib/mdnsd/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/dd/Makefile	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/dd/dd.c	diff1 \|	diff2 \|	blob \| history
usr/src/cmd/zfs/zfs_main.c	diff1 \|	diff2 \|	blob \| history
usr/src/contrib/mDNSResponder/README	diff1 \|	diff2 \|	blob \| history
usr/src/contrib/mDNSResponder/mDNSPosix/mDNSPosix.c	diff1 \|	diff2 \|	blob \| history
usr/src/contrib/mDNSResponder/mDNSShared/uds_daemon.c	diff1 \|	diff2 \|	blob \| history
usr/src/lib/libdns_sd/Makefile.com	diff1 \|	diff2 \|	blob \| history
usr/src/pkg/manifests/service-network-dns-mdns.mf	diff1 \|	diff2 \|	blob \| history
usr/src/uts/common/io/nvme/nvme.c	diff1 \|	diff2 \|	blob \| history

Unleashed OS