Age | Commit message (Collapse) | Author | Files | Lines |
|
commit 8da39a785b59a8f5bb6f0c441e93ccc965f15305
7283 ptime(1M) synopsis is compressed
|
|
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: Mohamed Khalfella <khalfella@gmail.com>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>
|
|
Reviewed by: Patrick Mooney <pmooney@pfmooney.com>
Reviewed by: Dave Pacheco <dap@joyent.com>
|
|
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
|
|
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Reviewed by: Ryan Zezeski <ryan@zinascii.com>
Approved by: Dan McDonald <danmcd@omniti.com>
|
|
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
|
|
Reviewed by: Bryan Cantrill <bryan@joyent.com>
|
|
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Eric Schrock <eric.schrock@delphix.com>
|
|
Reviewed by: Alexander Eremin <alexander.eremin@nexenta.com>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
|
|
Reviewed by: garrett@nexenta.com
Reviewed by: gwr@nexenta.com
Reviewed by: trisk@opensolaris.org
Approved by: gwr@nexenta.com
--HG--
extra : rebase_source : 0c599d0bec0dc8865fbba67721a7a6cd6b1feefb
|