smartos-live -------- commit e07b2d7fd21c58c9a366d7a5ae040a212f850af5 Author: Keith M Wesolowski Date: Thu Aug 29 22:32:02 2013 +0000 OS-2456 sd timeout/retry settings are absurd OS-2457 mptsas timeout subsystem needs finer granularity commit 794fcf5d9476916f0c1bde8eef4c12f6782bcadf Author: Keith M Wesolowski Date: Wed Sep 4 14:15:52 2013 +0000 3600 edit(1) is a bad .so reference (fix merge cruft) commit f0b794af39bd7a4415660b9df574f3d5dc32c727 Author: Orlando Vazquez Date: Sat Aug 31 16:27:45 2013 +0000 OS-2474: If we get an error trying to create the zone socket, back-off and retry a few seconds later. commit 7f36cb906f36cb8ee0b569ff90597501f32f777e Author: Keith M Wesolowski Date: Wed Sep 4 05:48:58 2013 +0000 OS-2479 the ramdisk must grow to accommodate gdamore's locales commit 0f1aa6df5dcad6fddc6197abddd282b9d58daad2 Author: Trent Mick Date: Wed Aug 28 12:35:35 2013 -0700 OS-2465 'imgadm create' should clean up its '@final' snapshot on the dataset on failure OS-2466 'imgadm create' should not fail on an existing '@final' snapshot on the VM commit e41666284647669756199e46538ed79b2dc7b273 Author: Josh Wilsdon Date: Fri Aug 23 17:49:58 2013 -0700 OS-2453 only call callback once when there's an error posting to vmadmd. commit db113d3404074df9e5b74a3fcf667bc454342145 Author: Josh Wilsdon Date: Fri Aug 23 16:40:04 2013 -0700 OS-2426 return an error when vmadm is unable to talk to vmadmd. commit f214c6a7dc295d2018c35c8a6a240f334b964377 Author: Rob Gulewich Date: Thu Aug 22 15:49:00 2013 -0700 FWAPI-72: fw.js: need to determine if remote VMs are the target of rules illumos -------- commit 092fe49637e40ccc367f723900bcb91ba2fab46d Author: Bryan Cantrill Date: Thu Sep 5 06:53:03 2013 +0000 OS-2437 arc_get_data_buf() blocks in vmem_alloc() instead of evicting commit 64af696dbea3e718e4c758e173de5fa35826dd41 Author: Bryan Cantrill Date: Thu Sep 5 06:46:02 2013 +0000 OS-2432 tail -f/-F missing some truncation events OS-2433 tail -f/-F can produce duplicate output after a truncation commit 1c485ea3760aeec397cb5b579d3feaf1c097ee4b Author: Keith M Wesolowski Date: Thu Aug 29 22:31:29 2013 +0000 OS-2456 sd timeout/retry settings are absurd commit 390f734762f6c2988562d99427368058c6178c3d Author: Keith M Wesolowski Date: Wed Sep 4 04:38:50 2013 +0000 3600 edit(1) is a bad .so reference (fix merge cruft) commit 911f8ef3be2d5eb224e6b365860f1d3cf6e908ec Merge: 72556f5 bfe5cd0 Author: Keith M Wesolowski Date: Wed Sep 4 01:24:08 2013 +0000 [illumos-gate merge] commit bfe5cd09d00f1b1e72fbe64036f3f80b73bd2738 2408 CJK character width handled incorrectly in terminal emulators (missing widths-2.txt) commit 2da1cd3a39e2d3da7f9d15071ea9462919c011ac 2408 CJK character width handled incorrectly in terminal emulators 3019 localedef(1) manpage is pretty out of date commit 03fc868668dd42b1b163d1fb8af3968f7283a7eb 672 xargs doesn't support -0 3356 xargs needlessly duplicates stdio buffering commit 03d446db9be5b68e630562c8b6b14aa7c8a0f4dc 4075 nscd spuriously thinks all databases are privileged commit ab823b7f933f787dbdf7a0bb790639210c583869 3965 find does not support -delete option commit a81df0a5d715363cc1841810a87818dfa95675c0 3933 contract adoption can race commit cf746768a898264fa491791a8252865e5338dc67 1974 pages_pp_maximum/lotsfree discrepancy leads to mlock() failure commit b6805bf78d2bbbeeaea8909a05623587b42d58b3 4072 make clobber leaves trash commit a9478106a12424322498e53cf7cd75bd8a4d6004 3600 edit(1) is a bad .so reference commit 5253393b09789ec67bec153b866d7285a1cf1645 4082 zfs receive gets EFBIG from dmu_tx_hold_free() Conflicts: usr/src/man/man7fs/Makefile (copyright) usr/src/man/man3xnet/Makefile (ntohll/htonll) usr/src/man/man3socket/Makefile (get/freeifaddrs) usr/src/man/man1m/Makefile (ipdadm) usr/src/cmd/localedef/Makefile (euro) usr/src/cmd/ipf/tools/Makefile.tools (copyright) .gitignore usr/src/cmd/lp/filter/postscript/postreverse/Makefile (deleted) usr/src/lib/libshell/Makefile.doc (deleted) usr/src/lib/print/libpapi-lpd/Makefile.com (deleted) usr/src/pkg/manifests/library-print-open-printing-ipp.mf (deleted) usr/src/pkg/manifests/print-lp-print-client-commands.mf (deleted) Manifests (scripted replacement): usr/src/pkg/manifests/SUNWcs.man1.inc usr/src/pkg/manifests/SUNWcs.man1m.inc usr/src/pkg/manifests/SUNWcs.man4.inc usr/src/pkg/manifests/SUNWcs.man5.inc usr/src/pkg/manifests/compatibility-ucb.mf usr/src/pkg/manifests/developer-tnf.mf usr/src/pkg/manifests/diagnostic-cpu-counters.mf usr/src/pkg/manifests/driver-firewire.mf usr/src/pkg/manifests/driver-usb.mf usr/src/pkg/manifests/library-libtecla.mf usr/src/pkg/manifests/library-print-open-printing-ipp.mf usr/src/pkg/manifests/library-security-tcp-wrapper.mf usr/src/pkg/manifests/naming-ldap.mf usr/src/pkg/manifests/network-iscsi-target.mf usr/src/pkg/manifests/print-lp-print-client-commands.mf usr/src/pkg/manifests/service-hal.mf usr/src/pkg/manifests/service-network-dns-mdns.mf usr/src/pkg/manifests/service-network-ftp.mf usr/src/pkg/manifests/service-network-network-clients.mf usr/src/pkg/manifests/service-network-network-servers.mf usr/src/pkg/manifests/service-network-nis.mf usr/src/pkg/manifests/service-network-smtp-sendmail.mf usr/src/pkg/manifests/service-network-telnet.mf usr/src/pkg/manifests/service-network-tftp.mf usr/src/pkg/manifests/service-network-uucp.mf usr/src/pkg/manifests/service-picl.mf usr/src/pkg/manifests/service-resource-pools.mf usr/src/pkg/manifests/service-security-gss.mf usr/src/pkg/manifests/service-storage-media-volume-manager.mf usr/src/pkg/manifests/storage-metassist.mf usr/src/pkg/manifests/storage-stmf.mf usr/src/pkg/manifests/storage-svm.mf usr/src/pkg/manifests/system-accounting-legacy.mf usr/src/pkg/manifests/system-boot-network.mf usr/src/pkg/manifests/system-extended-system-utilities.mf usr/src/pkg/manifests/system-file-system-smb.mf usr/src/pkg/manifests/system-header.mf usr/src/pkg/manifests/system-kernel-platform.mf usr/src/pkg/manifests/system-kernel-ultra-wideband.mf usr/src/pkg/manifests/system-kernel.man2.inc usr/src/pkg/manifests/system-kernel.man4.inc usr/src/pkg/manifests/system-kernel.man7.inc usr/src/pkg/manifests/system-kernel.man7d.inc usr/src/pkg/manifests/system-kernel.man7fs.inc usr/src/pkg/manifests/system-kernel.man7m.inc usr/src/pkg/manifests/system-kernel.man7p.inc usr/src/pkg/manifests/system-kernel.man9.inc usr/src/pkg/manifests/system-kernel.man9e.inc usr/src/pkg/manifests/system-kernel.man9f.inc usr/src/pkg/manifests/system-kernel.man9p.inc usr/src/pkg/manifests/system-kernel.man9s.inc usr/src/pkg/manifests/system-library-security-libsasl.mf usr/src/pkg/manifests/system-library-storage-libmpapi.mf usr/src/pkg/manifests/system-library.man3.inc usr/src/pkg/manifests/system-library.man3bsm.inc usr/src/pkg/manifests/system-library.man3c.inc usr/src/pkg/manifests/system-library.man3c_db.inc usr/src/pkg/manifests/system-library.man3cfgadm.inc usr/src/pkg/manifests/system-library.man3commputil.inc usr/src/pkg/manifests/system-library.man3contract.inc usr/src/pkg/manifests/system-library.man3curses.inc usr/src/pkg/manifests/system-library.man3devid.inc usr/src/pkg/manifests/system-library.man3devinfo.inc usr/src/pkg/manifests/system-library.man3dlpi.inc usr/src/pkg/manifests/system-library.man3elf.inc usr/src/pkg/manifests/system-library.man3exacct.inc usr/src/pkg/manifests/system-library.man3ext.inc usr/src/pkg/manifests/system-library.man3fstyp.inc usr/src/pkg/manifests/system-library.man3gen.inc usr/src/pkg/manifests/system-library.man3kstat.inc usr/src/pkg/manifests/system-library.man3kvm.inc usr/src/pkg/manifests/system-library.man3ldap.inc usr/src/pkg/manifests/system-library.man3lgrp.inc usr/src/pkg/manifests/system-library.man3lib.inc usr/src/pkg/manifests/system-library.man3mail.inc usr/src/pkg/manifests/system-library.man3malloc.inc usr/src/pkg/manifests/system-library.man3mp.inc usr/src/pkg/manifests/system-library.man3nsl.inc usr/src/pkg/manifests/system-library.man3nvpair.inc usr/src/pkg/manifests/system-library.man3pam.inc usr/src/pkg/manifests/system-library.man3scf.inc usr/src/pkg/manifests/system-library.man3sec.inc usr/src/pkg/manifests/system-library.man3secdb.inc usr/src/pkg/manifests/system-library.man3sip.inc usr/src/pkg/manifests/system-library.man3socket.inc usr/src/pkg/manifests/system-library.man3tsol.inc usr/src/pkg/manifests/system-library.man3uuid.inc usr/src/pkg/manifests/system-library.man3volmgt.inc usr/src/pkg/manifests/system-library.man3xcurses.inc usr/src/pkg/manifests/system-library.man3xnet.inc usr/src/pkg/manifests/system-library.man5.inc usr/src/pkg/manifests/system-network-http-cache-accelerator.mf usr/src/pkg/manifests/system-network-nis.mf usr/src/pkg/manifests/system-network-routing.mf usr/src/pkg/manifests/system-remote-shared-memory.mf usr/src/pkg/manifests/system-security-kerberos-5.mf usr/src/pkg/manifests/system-storage-fibre-channel-port-utility.mf usr/src/pkg/manifests/system-storage-sasinfo.mf usr/src/pkg/manifests/text-doctools.mf commit bfe5cd09d00f1b1e72fbe64036f3f80b73bd2738 Author: Garrett D'Amore Date: Tue Sep 3 09:17:39 2013 -0700 2408 CJK character width handled incorrectly in terminal emulators (missing widths-2.txt) commit 2da1cd3a39e2d3da7f9d15071ea9462919c011ac Author: Garrett D'Amore Date: Tue Aug 27 18:16:23 2013 -0700 2408 CJK character width handled incorrectly in terminal emulators 3019 localedef(1) manpage is pretty out of date Reviewed by: Yuri Pankov Reviewed by: Lauri Tirkkonen Reviewed by: Andy Stormont Approved by: Gordon Ross commit 03fc868668dd42b1b163d1fb8af3968f7283a7eb Author: Garrett D'Amore Date: Tue Aug 27 13:00:09 2013 -0700 672 xargs doesn't support -0 3356 xargs needlessly duplicates stdio buffering Reviewed by: Prasad Joshi Reviewed by: Gary Mills Approved by: Robert Mustacchi commit 03d446db9be5b68e630562c8b6b14aa7c8a0f4dc Author: Richard Lowe Date: Fri Aug 23 15:33:55 2013 -0400 4075 nscd spuriously thinks all databases are privileged Reviewed by: Marcel Telka Reviewed by: Josef 'Jeff' Sipek Reviewed by: Albert Lee Approved by: Dan McDonald commit ab823b7f933f787dbdf7a0bb790639210c583869 Author: Prasad Joshi Date: Wed Aug 7 16:17:12 2013 +0530 3965 find does not support -delete option Reviewed by: Andy Stormont Approved by: Robert Mustacchi commit a81df0a5d715363cc1841810a87818dfa95675c0 Author: Jerry Jelinek Date: Tue Mar 29 15:47:25 2011 -0700 3933 contract adoption can race Reviewed by: Bryan Cantrill Reviewed by: Richard Lowe Reviewed by: Garrett D'Amore Approved by: Dan McDonald commit cf746768a898264fa491791a8252865e5338dc67 Author: Bryan Cantrill Date: Sat Aug 3 16:27:57 2013 -0700 1974 pages_pp_maximum/lotsfree discrepancy leads to mlock() failure Reviewed by: Keith Wesolowski Reviewed by: Brendan Gregg Approved by: Garrett D'Amore commit b6805bf78d2bbbeeaea8909a05623587b42d58b3 Author: Gordon Ross Date: Fri Aug 23 18:31:03 2013 -0400 4072 make clobber leaves trash Reviewed by: Albert Lee Reviewed by: Dan McDonald Reviewed by: Marcel Telka Reviewed by: Richard Lowe Approved by: Garrett D'Amore commit a9478106a12424322498e53cf7cd75bd8a4d6004 Author: Yuri Pankov Date: Thu Aug 29 02:33:28 2013 +0400 3600 edit(1) is a bad .so reference Reviewed by: Richard Lowe Reviewed by: Garrett D'Amore Reviewed by: Gordon Ross Approved by: Richard Lowe commit 5253393b09789ec67bec153b866d7285a1cf1645 Author: Matthew Ahrens Date: Fri Aug 30 01:19:35 2013 -0800 4082 zfs receive gets EFBIG from dmu_tx_hold_free() Reviewed by: Eric Schrock Reviewed by: Christopher Siden Reviewed by: George Wilson Approved by: Richard Lowe commit 72556f5bbf7b7abd71cb57d6362d62790417afa6 Merge: e9c1240 22e3098 Author: Keith M Wesolowski Date: Thu Aug 29 22:55:15 2013 +0000 [illumos-gate merge] commit 22e30981d82a0b6dc89253596ededafae8655e00 3954 metaslabs continue to load even after hitting zfs_mg_alloc_failure limit 4080 zpool clear fails to clear pool 4081 need zfs_mg_noalloc_threshold commit 3a9fcf3eb769315c8984c438833b8b1453206fa4 4049 filesystem(5) documents /usr/bin/amd64 twice commit 511588bb13d2462265d682dc1cb7ba5c7a27a771 4048 cpu_acpi is too verbose about disabled SpeedStep/PowerNow! support commit 22e30981d82a0b6dc89253596ededafae8655e00 Author: George Wilson Date: Thu Aug 29 10:56:49 2013 -0800 3954 metaslabs continue to load even after hitting zfs_mg_alloc_failure limit 4080 zpool clear fails to clear pool 4081 need zfs_mg_noalloc_threshold Reviewed by: Adam Leventhal Reviewed by: Matthew Ahrens Approved by: Richard Lowe commit 3a9fcf3eb769315c8984c438833b8b1453206fa4 Author: Bart Coddens Date: Thu Aug 29 11:19:56 2013 -0700 4049 filesystem(5) documents /usr/bin/amd64 twice Reviewed by: Richard Lowe Reviewed by: Garrett D'Amore Approved by: Garrett D'Amore commit 511588bb13d2462265d682dc1cb7ba5c7a27a771 Author: Yuri Pankov Date: Thu Aug 29 02:06:39 2013 +0400 4048 cpu_acpi is too verbose about disabled SpeedStep/PowerNow! support Reviewed by: Albert Lee Reviewed by: Garrett D'Amore Approved by: Dan McDonald commit e9c1240c4cdcc39caeef0ce9cb97380612ae0f9d Author: Jerry Jelinek Date: Wed Aug 28 21:51:15 2013 +0000 OS-2463 restore zone-based zfs scheduling, based on new behavior commit b3b94798b52339dbb6b0750553afd56050728b1b Author: Joshua M. Clulow Date: Wed Aug 28 12:13:19 2013 -0700 OS-2444 richmond hardware maps need to support ivy bridge Reviewed by: Keith Wesolowski Reviewed by: Richard Lowe commit e08b1aa66ae3387112925af6cc2a2453c4e67673 Merge: a236ad2 e9a5ec5 Author: Keith M Wesolowski Date: Wed Aug 28 00:48:47 2013 +0000 [illumos-gate merge] commit e9a5ec5aa8a1a14de1b019c6bd73e0a33f920e49 195 Need replacement for nfs/lockd+klm (exception_lists) commit 69a119caa6570c7077699161b7c28b6ee9f8b0f4 3946 ::gcore (fix sparc build) commit 2df37efa12a69b067c7197296dd802eb4b8a9e85 3518 Incorrect hostid calculation commit bbaa8b60dd95d714741fc474adad3cf710ef4efd 195 Need replacement for nfs/lockd+klm commit e9a5ec5aa8a1a14de1b019c6bd73e0a33f920e49 Author: Gordon Ross Date: Tue Aug 27 15:15:40 2013 -0400 195 Need replacement for nfs/lockd+klm (exception_lists) commit a236ad2672136486568b66b817018a2e7065ca57 Author: Keith M Wesolowski Date: Tue Aug 27 17:51:58 2013 +0000 [illumos-gate merge] commit 69962b5647e4a8b9b14998733b765925381b727e 4045 zfs write throttle & i/o scheduler performance work commit 7e0e2549bfaa531aff576083ab0c07f84fa8fb27 3845 beadm doesn't work in non-global zones commit dc986d9f4cb40f3ff88fe0d9c9fb3a51ad50f0d9 4054 dis sometimes decides random symbols are functions commit edd4ab01432cfb07428329ad6e8071e8923d0b20 3194 dis crashes disassembling aes Conflicts: usr/src/uts/common/fs/zfs/vdev_queue.c usr/src/uts/common/fs/zfs/sys/zio.h usr/src/uts/common/fs/zfs/sys/vdev_impl.h usr/src/uts/common/fs/zfs/sys/dsl_dir.h usr/src/uts/common/fs/zfs/dsl_pool.c usr/src/uts/common/fs/zfs/arc.c usr/src/lib/libbe/common/be_list.c commit 69a119caa6570c7077699161b7c28b6ee9f8b0f4 Author: Christopher Siden Date: Tue Aug 27 10:51:34 2013 -0800 3946 ::gcore (fix sparc build) commit 2df37efa12a69b067c7197296dd802eb4b8a9e85 Author: Garrett D'Amore Date: Fri Feb 1 12:04:34 2013 -0800 3518 Incorrect hostid calculation Reviewed by: Gordon Ross Reviewed by: Richard Elling Reviewed by: Andy Giles Reviewed by: Dan McDonald Approved by: Dan McDonald commit bbaa8b60dd95d714741fc474adad3cf710ef4efd Author: Dan Kruchinin Date: Mon Aug 26 20:42:32 2013 -0800 195 Need replacement for nfs/lockd+klm Reviewed by: Gordon Ross Reviewed by: Jeremy Jones Reviewed by: Jeff Biseda Approved by: Garrett D'Amore commit 7bf5a6f485b8d8bb5c024482e916542997c5d6b6 Author: Keith M Wesolowski Date: Tue Aug 27 00:59:04 2013 +0000 back out merge: incompatible ZFS throttling mechanisms commit d907c5084d3f67c85c5551ee093457940f8aec17 Merge: 6344b44 69962b5 Author: Keith M Wesolowski Date: Mon Aug 26 23:02:51 2013 +0000 [illumos-gate merge] commit 69962b5647e4a8b9b14998733b765925381b727e 4045 zfs write throttle & i/o scheduler performance work commit 7e0e2549bfaa531aff576083ab0c07f84fa8fb27 3845 beadm doesn't work in non-global zones commit dc986d9f4cb40f3ff88fe0d9c9fb3a51ad50f0d9 4054 dis sometimes decides random symbols are functions commit edd4ab01432cfb07428329ad6e8071e8923d0b20 3194 dis crashes disassembling aes Conflicts: usr/src/uts/common/fs/zfs/vdev_queue.c usr/src/uts/common/fs/zfs/sys/zio.h usr/src/uts/common/fs/zfs/sys/vdev_impl.h usr/src/uts/common/fs/zfs/sys/dsl_dir.h usr/src/uts/common/fs/zfs/dsl_pool.c usr/src/uts/common/fs/zfs/arc.c usr/src/lib/libbe/common/be_list.c commit 69962b5647e4a8b9b14998733b765925381b727e Author: Matthew Ahrens Date: Mon Aug 26 13:13:26 2013 -0800 4045 zfs write throttle & i/o scheduler performance work Reviewed by: George Wilson Reviewed by: Adam Leventhal Reviewed by: Christopher Siden Reviewed by: Ned Bass Reviewed by: Brendan Gregg Approved by: Robert Mustacchi commit 7e0e2549bfaa531aff576083ab0c07f84fa8fb27 Author: Alexander Eremin Date: Mon Aug 26 13:52:20 2013 -0400 3845 beadm doesn't work in non-global zones Reviewed by: Hans Rosenfeld Reviewed by: Andrew Stormont Reviewed by: Richard Lowe Approved by: Dan McDonald commit dc986d9f4cb40f3ff88fe0d9c9fb3a51ad50f0d9 Author: Richard Lowe Date: Sat Aug 17 17:54:47 2013 -0400 4054 dis sometimes decides random symbols are functions Reviewed by: Robert Mustacchi Reviewed by: Josef 'Jeff' Sipek Approved by: Albert Lee commit edd4ab01432cfb07428329ad6e8071e8923d0b20 Author: Richard Lowe Date: Fri Aug 16 18:18:28 2013 -0400 3194 dis crashes disassembling aes Reviewed by: Jason King Reviewed by: Josef 'Jeff' Sipek Reviewed by: Eric Schrock Approved by: Albert Lee commit 6344b441ffaa746030673ed598c637141b24f080 Author: Keith M Wesolowski Date: Sat Aug 24 16:07:34 2013 +0000 2932 support crash dumps to raidz, etc. pools (fix mismerge) commit 241ad8432452015cc2cfbc85f2c132ba281449cc Merge: d52d689 9edf9eb Author: Keith M Wesolowski Date: Sat Aug 24 00:09:05 2013 +0000 [illumos-gate merge] commit 9edf9ebd727ac2046be0269a5e275785e2131bcb 1765 assert triggered in libzfs_import.c trying to import pool name beginning with a number commit 810e43b2eb0e320833671a403fdda51917e8b036 2932 support crash dumps to raidz, etc. pools commit 1b3b16f35bee1ffc210591d82bca6adf247954b0 3785 Implement MAP_32BIT flag to mmap() commit d52d689c764b76be70d1d9f8ccc7ad906acf9a1a Author: Jerry Jelinek Date: Fri Aug 23 20:27:11 2013 +0000 OS-2450 libproc assertion failure commit 9edf9ebd727ac2046be0269a5e275785e2131bcb Author: Prasad Joshi Date: Mon Aug 19 20:01:38 2013 +0530 1765 assert triggered in libzfs_import.c trying to import pool name beginning with a number Reviewed-by: Garrett D'Amore Reviewed-by: Matthew Ahrens Approved by: Robert Mustacchi commit 810e43b2eb0e320833671a403fdda51917e8b036 Author: Bill Pijewski Date: Thu Aug 22 19:03:54 2013 +0000 2932 support crash dumps to raidz, etc. pools Reviewed by: Jerry Jelinek Reviewed by: Matthew Ahrens Approved by: Dan McDonald commit 1b3b16f35bee1ffc210591d82bca6adf247954b0 Author: Theo Schlossnagle Date: Fri Aug 23 11:13:02 2013 -0400 3785 Implement MAP_32BIT flag to mmap() Reviewed by: Albert Lee Reviewed by: Dan McDonald Reviewed by: Robert Mustacchi Approved by: Dan McDonald commit 7ad33db363abcdda8279c2deb53ecafddd4bd978 Author: Jerry Jelinek Date: Fri Aug 23 12:29:42 2013 +0000 OS-2417 fix multi-vdev crash dump feature enabling commit 618bee760a4208c3a0e7ec28bc27210395278e57 Merge: 84a6527 b62969f Author: Keith M Wesolowski Date: Thu Aug 22 23:09:07 2013 +0000 [illumos-gate merge] commit b62969f868a827f0823a084bc0af9c7d8b76c659 4046 dsl_dataset_t ds_dir->dd_lock is highly contended commit 60c49c69080806d302eecdc7c8f69a0b88cac397 3974 mistake on stdlib.h commit b62969f868a827f0823a084bc0af9c7d8b76c659 Author: Matthew Ahrens Date: Thu Aug 22 09:51:47 2013 -0800 4046 dsl_dataset_t ds_dir->dd_lock is highly contended Reviewed by: Eric Schrock Reviewed by: George Wilson Approved by: Garrett D'Amore commit 60c49c69080806d302eecdc7c8f69a0b88cac397 Author: Igor Kozhukhov Date: Thu Aug 22 11:24:29 2013 -0400 3974 mistake on stdlib.h Reviewed by: Alexander Pyhalov Reviewed by: Gary Mills Approved by: Dan McDonald illumos-extra -------- kvm -------- kvm-cmd --------