Merge commit 'c7a0678d54bbc87f507a8909a193f75cbb463ede'
commit505782b198e744578206bd504c9225186c5a3db4
authorJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 19:01:54 +0000 (21 15:01 -0400)
committerJosef 'Jeff' Sipek <jeffpc@josefsipek.net>
Tue, 21 Aug 2018 19:01:54 +0000 (21 15:01 -0400)
treeff198f88412ad55aa1b15fec34ffdc5250490afa
parent557c99c5c2ed4ed27d68dbe89416468f6f2a457a
parentc7a0678d54bbc87f507a8909a193f75cbb463ede
Merge commit 'c7a0678d54bbc87f507a8909a193f75cbb463ede'
usr/src/cmd/svc/svccfg/svccfg_xml.c
usr/src/cmd/svc/svcs/svcs.c