diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-26 12:39:31 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2016-02-26 12:39:31 +0000 |
| commit | cd6d980e0d9fa21ff08e425a6e31b5c05780c1f1 (patch) | |
| tree | 1c6e16a0e6aa865155abb618d0b5aa5062a5f264 /usr/src/cmd/devfsadm/devfsadm.c | |
| parent | 3b429d37b9ba78c77cb6292ba61f0574315fb421 (diff) | |
| parent | 5ffb0c9b03b5149ff4f5821a62be4a52408ada2a (diff) | |
| download | illumos-joyent-cd6d980e0d9fa21ff08e425a6e31b5c05780c1f1.tar.gz | |
[illumos-gate merge]
commit 5ffb0c9b03b5149ff4f5821a62be4a52408ada2a
3661 Sync mDNS with upstream
commit 8551f527eff6d736e8191795ffafe40abbdb71e6
6416 ptime -p could support multiple processes
Conflicts:
usr/src/man/man1/proc.1
usr/src/lib/libdns_sd/java/com/apple/dnssd/DNSSDRecordRegistrar.java
usr/src/cmd/ptools/ptime/ptime.c
usr/src/cmd/cmd-inet/usr.lib/mdnsd/DNSCommon.c
Diffstat (limited to 'usr/src/cmd/devfsadm/devfsadm.c')
0 files changed, 0 insertions, 0 deletions