summaryrefslogtreecommitdiff
path: root/usr/src/test
AgeCommit message (Collapse)AuthorFilesLines
2018-02-079004 Some ZFS tests used files removed with 32 bit kernelJohn Wren Kennedy5-15/+19
Reviewed by: Igor Kozhukhov <igor@dilos.org> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Dan McDonald <danmcd@joyent.com>
2018-02-078965 zfs_acl_ls_001_pos fails due to no longer supported grep regexJohn Wren Kennedy1-3/+3
Reviewed by: Akash Ayare <aayare@delphix.com> Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com> Reviewed by: Yuri Pankov <yuripv@icloud.com> Reviewed by: Igor Kozhukhov <igor@dilos.org> Approved by: Dan McDonald <danmcd@joyent.com>
2018-02-078942 zfs promote .../%recv should be an errorloli10K5-5/+53
Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Dan McDonald <danmcd@joyent.com>
2018-02-078941 zpool add: assertion failed in get_replication() with nested interior VDEVsloli10K5-3/+159
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Approved by: Dan McDonald <danmcd@joyent.com>
2018-02-078477 Assertion failed in vdev_state_dirty(): spa_writeable(spa)loli10K4-3/+77
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Dan McDonald <danmcd@joyent.com>
2018-02-078408 dsl_props_set_sync_impl() does not handle nested nvlists correctlyloli10K4-3/+127
Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Dan McDonald <danmcd@joyent.com>
2018-02-079027 Makefiles need to specify C99 mode consistently [fix broken build]Jerry Jelinek1-2/+2
2018-02-07 [illumos-gate merge]Jerry Jelinek11-11/+11
commit 3385b4726f1b09aa9511340017fb23c7cde6aadd 8472 Want docs for iports, tgtmaps, and friends commit 1eb7f6f10a2bf852886fac64ce710da077f20c75 8706 libc lint library missing endian.h functions commit e144c4e6c90e7d4dccaad6db660ee42b6e7ba04f 8962 zdb should work on non-idle pools commit 3ee8c80c747c4aa3f83351a6920f30c411236e1b 8961 SPA load/import should tell us why it failed commit 1fd3785ff6601d3e391378c2dcbf4c5f27e1fe32 7638 Refactor spa_load_impl into several functions commit 82693e09cc02331fa1b3b73b54b1060e73507a8d 8966 Source file zfs_acl.c, function zfs_aclset_common contains a use after end of the lifetime of a local variable commit d3c0397fdfe3697d5078fec583494fae9971fd75 9039 tcp(7p): Duplicate paragraph commit af8443c4728e4601db72fb8089035223de906eb9 9022 loader.efi: module placement must check memory map commit bd0ce624be4492bab2f6c53383a40618647aba28 9027 Makefiles need to specify C99 mode consistently Conflicts: usr/src/man/man9f/scsi_hba_iportmap_create.9f usr/src/man/man9f/scsi_address_device.9f usr/src/man/man9/iport.9 usr/src/cmd/cmd-inet/usr.sbin/ping/Makefile
2018-02-069027 Makefiles need to specify C99 mode consistentlyYuri Pankov11-11/+11
Reviewed by: Rich Lowe <richlowe@richlowe.net> Approved by: Hans Rosenfeld <hans.rosenfeld@joyent.com>
2018-02-05 [illumos-gate merge]Jerry Jelinek42-1223/+2989
commit c73799dd86c25c27f5183e83584212d06d1ecebc 9024 rework PV-HVM disk device handling commit fcebcf2bde9c499fa119ba1d185c1d9dd8db8c31 9023 port Delphix Xen-related fixes commit ff074caab09347cf7a3028cad320325b14d826ce 9006 parallel loader builds fail sporadically commit 0f554fe53a6056402dbaf025d945afa8659af0c7 9001 cdm is useless, remove it 9002 webrev should know how to get the git user name commit a96858a0ffbb0a37a4c126a6889a50342c8e0ac5 9013 cmd/vi: don't use obsolete REG_WORDS commit 925beec7a40f23f8a7663cf5e8289a88f9688e87 9012 cmd/grep: don't use obsolete REG_ANCHOR commit 16b8cff5614360cedee81496774b4933d65c2a62 9007 import AT&T regex test suite commit b4509b050d50104aa22638bf66c219627cf301af 6690 set_nfsv4_ephemeral_mount_to() tries to read AUTOMOUNT_TIMEOUT from defunct /etc/default/autofs commit 8baf4f951af3e9e291859c8e5cb2ea4a83c6a531 9015 krb5-config emits unnecessary -R flags 1295 krb5-config only understands krb5 Conflicts: usr/src/tools/scripts/webrev.sh usr/src/tools/onbld/hgext/__init__.py (deleted)
2018-02-029007 import AT&T regex test suiteYuri Pankov42-1223/+2989
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
2018-01-29 [illumos-gate merge]Jerry Jelinek2-2/+2
commit 5647635c25e095eb92ade015b8b639aaf8bcdcac 8668 mac_srs_change_upcall() is unused 8669 MAC_DBG_PRT is unused commit a21e40770e26ca1023b9dee7001794f67f7bddcb 9003 libc-tests: newlocale_test silently fails after CLDR updates commit 1efcb03414b4ab2cb1943cd8cd5fbd8a2019eb40 8994 libc-tests: nl_langinfo_test fails after 1198 commit 6c9c1c0d3911e7534e0028fb6e2a09aa4609730d commit f627793a66375709ebd33b4f64774dfee1db48fb 8998 depcheck is useless and should be removed commit 4ed1382ba00606e1de9b09a46440fff341db026f 8992 checkproto is useless and can be deleted commit 498924fdb0b10437ef130a81beee94e710d55a5b 8991 pmodes is useless and can be deleted commit 5c60adfb7915647f372e2ddb0c4b967d3d03f779 8990 /opt/onbld/gk is useless commit 6af78b59cf0bb5ad194f2ab51b2302d8c45d2543 8571 Makefile.master should not trust $PATH commit f864f99efe57685e1762590c1a880dd16bca6da9 8997 ztest assertion failure in zil_lwb_write_issue
2018-01-289003 libc-tests: newlocale_test silently fails after CLDR updatesYuri Pankov1-1/+1
Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Garrett D'Amore <garrett@damore.org> Reviewed by: Alek Pinchuk <pinchuk.alek@gmail.com> Approved by: Robert Mustacchi <rm@joyent.com>
2018-01-288994 libc-tests: nl_langinfo_test fails after 1198Yuri Pankov1-1/+1
Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Robert Mustacchi <rm@joyent.com>
2018-01-26OS-6577 ofdlock(): assertion failed: lckdat->l_start == 0Jerry Jelinek2-2/+38
Reviewed by: Dan McDonald <danmcd@joyent.com> Reviewed by: Cody Mello <cody.mello@joyent.com> Reviewed by: John Levon <john.levon@joyent.com> Approved by: Cody Mello <cody.mello@joyent.com>
2018-01-168927 sadb_x_kmc_t's KM cookie should be 64-bits (fix improper upstream)Dan McDonald2-15/+20
2018-01-11OS-6557 fmdump misinterprets retval of nvlist_print_json()Rob Johnston1-1/+1
Reviewed by: Joshua M. Clulow <jmc@joyent.com> Reviewed by: Dan McDonald <danmcd@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
2018-01-11 [illumos-gate merge]Jerry Jelinek38-7/+1898
commit 5cabbc6b49070407fb9610cfe73d4c0e0dea3e77 7614 zfs device evacuation/removal commit eb9c32327f4caf584b309530acc3df1b67f1d286 8925 boot1.efi: link with libefi
2018-01-10Fix messed-up upstream of OS-6333/illumos#8927.Dan McDonald2-41/+187
Restore conflicted files: usr/src/lib/libipsecutil/common/ipsec_util.c usr/src/test/os-tests/tests/pf_key/kmc-update.sh usr/src/test/os-tests/tests/pf_key/kmc-updater.c usr/src/uts/common/inet/ip/sadb.c To re-include: OS-6333 (commit 02ba530437bfbfdddf56de010d62a5ff453813ae) OS-6480 (commit 9ba45b30b3b7aaeb1b63f85670403e6ea3a550eb) NOTE: Source histories of those particular files lost illumos-joyent changes.
2018-01-107614 zfs device evacuation/removalPrashanth Sreenivasa38-7/+1898
Reviewed by: Alex Reece <alex@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: John Kennedy <john.kennedy@delphix.com> Reviewed by: Prakash Surya <prakash.surya@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: Richard Laager <rlaager@wiktel.com> Reviewed by: Tim Chase <tim@chase2k.com> Approved by: Garrett D'Amore <garrett@damore.org>
2018-01-10 [illumos-gate merge]Jerry Jelinek6-194/+49
commit 1adc3ffcd976ec0a34010cc7db08037a14c3ea4c 8958 Update Intel ucode to 20180108 release commit f4a6f97e1baae5b3d0df9a121730f1e3cc7bfbca 8927 sadb_x_kmc_t's KM cookie should be 64-bits commit aec11327541942bfe9685ddc467de0cfd80b974d 8921 iwn: remove lint support commit d2d52addd50254d1b7c318c6784172d8d7de20c6 8858 /usr/bin/grep doesn't support -E option 4580 /usr/bin/grep can't handle multibyte characters 8929 8868 tests are not delivered with system/test/utiltest 8860 Example in grep(1) is incorrect Conflicts: usr/src/uts/common/inet/ip/sadb.c usr/src/test/os-tests/tests/pf_key/kmc-updater.c usr/src/test/os-tests/tests/pf_key/kmc-update.sh usr/src/lib/libshell/misc/shell_styleguide.docbook usr/src/lib/libipsecutil/common/ipsec_util.c
2018-01-098927 sadb_x_kmc_t's KM cookie should be 64-bitsDan McDonald3-6/+294
Reviewed by: Jason King <jason.king@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Richard Lowe <richlowe@richlowe.net>
2018-01-098858 /usr/bin/grep doesn't support -E optionAlexander Pyhalov3-3/+8
4580 /usr/bin/grep can't handle multibyte characters 8929 8868 tests are not delivered with system/test/utiltest 8860 Example in grep(1) is incorrect Reviewed by: Peter Tribble <peter.tribble@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Approved by: Robert Mustacchi <rm@joyent.com>
2017-12-18 [illumos-gate merge]Jerry Jelinek1-0/+73
commit 94ddd0900a8838f62bba15e270649a42f4ef9f81 8909 8585 can cause a use-after-free kernel panic commit a8feb7338362ea067733d5dd40f4365dd99c4d31 8910 man pages should refer to our Modular Debugger Guide
2017-12-158909 8585 can cause a use-after-free kernel panicPrakash Surya1-0/+73
Reviewed by: John Kennedy <jwk404@gmail.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: George Wilson <george.wilson@delphix.com> Reviewed by: Brad Lewis <brad.lewis@delphix.com> Reviewed by: Igor Kozhukhov <igor@dilos.org> Approved by: Robert Mustacchi <rm@joyent.com>
2017-12-11 [illumos-gate merge]Jerry Jelinek6-4/+62
commit e41ba543c907a7f890945c577bac3566017e4162 8868 /usr/xpg4/bin/grep dumps core in find_nl() commit 281819e5f8b19cd8627541a22d261906fd190276 1915 IPsec kstats shouldn't be persistent
2017-12-088868 /usr/xpg4/bin/grep dumps core in find_nl()Matt Barden6-4/+62
Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
2017-12-05OS-6480 Allow IKEV2 pf_key(7P) key management cookies to be updated after setJason King3-29/+171
Reviewed by: Dan McDonald <danmcd@joyent.com> Approved by: Dan McDonald <danmcd@joyent.com>
2017-12-01 [illumos-gate merge]Jerry Jelinek39-1/+4150
commit cd964fce751ca752af4158842063a9579a2d4331 5869 Need AES CMAC support in KCF+PKCS11 commit 6dfcdabd85f09409c5d2f9fb25a3013384ffaf74 8800 loader: use the same option list for dhcp discovery and request commit dfbc6f2daa6bb8fc06fad985ead27d5db30eab3a 8799 loader: Always issue the pxe request commit 494a2e4857c10ebf74b8a5652d96466bd9e02f2c 8865 nightly shouldn't depend on specific /usr/bin/egrep behavior
2017-11-305869 Need AES CMAC support in KCF+PKCS11Matt Barden39-1/+4150
Portions contributed by: Jason King <jason.king@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Dan McDonald <danmcd@joyent.com> Approved by: Gordon Ross <gwr@nexenta.com>
2017-11-20 [illumos-gate merge]Jerry Jelinek13-38/+178
commit a375f4369f2774fb4628ce225260143f7e530cec 8788 tavor: variable 'cfi_dw_info' set but not used commit 8b8be354eac32fe0c94a52f66250bff1b4e646a1 8787 hermon: variable 'cfi_dw_info' set but not used commit a3b2868063897ff0083dea538f55f9873eec981f 8677 Open-Context Channel Programs commit 9dca21df58d57c2dadfa3bcb1d33c7bd0260cfd8 8807 More recent glib updates break hald build
2017-11-178677 Open-Context Channel ProgramsSerapheim Dimitropoulos13-38/+178
Reviewed by: Matt Ahrens <mahrens@delphix.com> Reviewed by: Chris Williamson <chris.williamson@delphix.com> Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com>
2017-11-17 [illumos-gate merge]Jerry Jelinek5-19/+31
commit b14715fcd76b149c1fa0e1137cd516631ca5f295 8699 Want NIC transceiver visibility (fix lint) commit 9d218268650a3767f3df2612043a730a935ea2a9 8804 nvme: add alias for pciclass,010802 commit 5b5fb15366257580ddfa65c652a1da8e0c6d4fd5 8795 loader: add efi_devpath_is_prefix() commit 7373b68a8a0aaee382a6403d5a70fce9bd19d62a 8786 s1394: variable 'type' set but not used commit c340f0f5876f4c5f9f4768c5b3f112e89b611888 8785 p4_pcbe: 'p4_cccrstop' defined but not used commit 4f62a6570dcd50f97b2c01e95cbb683b3f9d7a7c 8783 pppd: 'rcsid' defined but not used commit 3078e445fa2468f969d4f787db6f303739fdf820 8782 chat: 'rcsid' defined but not used commit f4d6818a2f6bb2640f51b221780039982957a0ca 8781 pppstats: 'rcsid' defined but not used commit ba448f1770618a414cb80eee258f018e711b407f 8780 gss_mechs: variable set but not used commit 38f33a76fa7f74946118fef8a670ecc05f7675e1 8778 kadm5: variable 'tl_data_orig' set but not used commit 495ee6847d0d3e288f47ba026d98a830e51cbc06 8777 krb5/plugins/kdb: variable set but not used commit 0f1d26a485e4e2010058758dfd2d45d98e3482b0 8772 kadmin/server: variable 'maj_stat' set but not used commit 6e573db1dd63b3b24579b7ceee32de57c994405c 8770 lofiadm: variable 'btMode' set but not used commit 9c3b8506879f8963287c430f2eb2e74c554a1c54 8724 libc: multiple variable set but not used errors commit 578f67364c19b20450a4783ebeae776c9e900185 8794 cstyle generates warnings with recent perl commit fa4b26fb5b73dd0f0319a34c6046034202e60bc6 8793 libbsm build failure with recent perl commit 5026b7fcee27ac1c884a99b607cc2abea07137d6 8775 krb5kdc: variable set but not used commit dfe02591ce4c15a40d7babbf85ceb4125485779d 8769 mv: variable 'rc' set but not used commit d9e525a856d3050197717c45fb58667e0ee0f297 8767 cmd/hal: variable set but not used commit 0803869a9bc0aff1c81287ac6eae15943cbba545 8766 pcitool: typedef locally defined but not used commit 62a14a75a4b2740af69a083f5ae385596db7ffc8 8763 sendmail: set but not used parameter/variable
2017-11-168699 Want NIC transceiver visibility (fix lint)Dan McDonald5-19/+31
Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Robert Mustacchi <rm@joyent.com>
2017-11-168699 Want NIC transceiver visibility [fix another mismerge]Jerry Jelinek1-1/+0
2017-11-16 [illumos-gate merge]Jerry Jelinek1-6/+14
commit 45d3dd981abb9025d8ac994cf4cc8ce8cb1a9480 8699 Want NIC transceiver visibility 8700 ixgbe MAC_CAPAB_TRANSCEIVER support 8701 i40e MAC_CAPAB_TRANSCEIVER support Conflicts: usr/src/uts/common/sys/mac_provider.h usr/src/uts/common/sys/mac_impl.h usr/src/uts/common/sys/dld.h usr/src/uts/common/io/mac/mac_provider.c usr/src/uts/common/io/mac/mac.c usr/src/uts/common/io/ixgbe/ixgbe_transceiver.c usr/src/uts/common/io/ixgbe/ixgbe_gld.c usr/src/uts/common/io/i40e/i40e_gld.c usr/src/uts/common/io/dld/dld_drv.c usr/src/test/util-tests/tests/libsff/Makefile usr/src/test/util-tests/tests/Makefile usr/src/test/util-tests/runfiles/default.run usr/src/man/man9e/Makefile usr/src/lib/libsff/common/libsff.c usr/src/lib/fm/topo/modules/common/shared/topo_port.c
2017-11-148699 Want NIC transceiver visibilityRobert Mustacchi33-1/+4013
8700 ixgbe MAC_CAPAB_TRANSCEIVER support 8701 i40e MAC_CAPAB_TRANSCEIVER support Reviewed by: Patrick Mooney <patrick.mooney@joyent.com> Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Ryan Zezeski <ryan.zeseski@joyent.com> Reviewed by: Yuri Pankov <yuripv@gmx.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Richard Lowe <richlowe@richlowe.net>
2017-11-13 [illumos-gate merge]Jerry Jelinek76-1/+308545
commit 81f499d2b4ccf5e24f8550abdfaf18142b430f5f 8761 IPv6 default policy table needs update for RFC6724 commit 62ba43a590f5c5aad74961c6c0d2c1703599b40c 8779 mech_spnego: variable set but not used commit 9992e6a682b1c35b4385c3b512db329ec8ab9ede 4701 would like grep context options (-A, -B, -C) commit 720b16875295d57e0e6a4e0ec32db4d47412f896 8789 usbgem: variable set but unused commit 8629b981ede6d47b0583ca2d3e62baeaa4f26e93 8768 lib/hal: variable set but not used commit d7dc20313645bcb9c9960a816baebe924d60bcf3 8764 rup: variable set but not used commit f667abe5ff605062ba1d9222a7ff814d54b420d8 8736 amt: variable set but not used commit cebd8f5216039c4a8d4553a19d3e8e4ff25ab941 8737 vi: variable set but not used commit b960a2708664bae74456527012602c0464e7f8ef 8756 tools: btxld should be able to only add version Conflicts: usr/src/test/util-tests/tests/Makefile exception_lists/copyright
2017-11-104701 would like grep context options (-A, -B, -C)Matthew Barden76-1/+308544
Reviewed by: Robert Mustacchi <rm@joyent.com> Reviewed by: Gary Mills <gary_mills@fastmail.fm> Reviewed by: Gordon Ross <gordon.w.ross@gmail.com> Approved by: Gordon Ross <gordon.w.ross@gmail.com>
2017-11-10 [illumos-gate merge]Jerry Jelinek1-0/+1
commit 272952165423c254ad7708f1b3fe2ff0a6ce408b 7531 Assign correct flags to prefetched buffers commit 638cab1445079b522f4c99f02eb7eba4d5819aae 8765 dladm tries setting persistent prop on temporary link Conflicts: usr/src/test/util-tests/tests/dladm/Makefile usr/src/test/util-tests/runfiles/default.run
2017-11-098765 dladm tries setting persistent prop on temporary linkRyan Zezeski3-3/+213
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com> Reviewed by: Sebastian Wiedenroth <sebastian.wiedenroth@skylime.net> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Gordon Ross <gwr@nexenta.com>
2017-10-09 [illumos-gate merge]Jerry Jelinek1-5/+7
commit c8b558ca47c321e76a2d41fc3d6a1259cbb182fb 8697 cmd/acpi: '_AcpiModuleName' defined but not used commit f905073d4c7083276dd5510a7006d2e98c6ec032 8647 loader should support large_dnode commit 64ee6612ceb686fa3f41561cf589072ebb0132b1 8657 test-runner dryrun (-d) fails for runfile (-c) mode
2017-10-068657 test-runner dryrun (-d) fails for runfile (-c) modeChris Fraire1-5/+7
Reviewed by: Yuri Pankov <yuripv@gmx.com> Reviewed by: John Kennedy <jwk404@gmail.com> Reviewed by: Toomas Soome <tsoome@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
2017-09-25OS-6333 sadb_x_kmc_t's KM cookie should be 64-bitsDan McDonald3-2/+299
Reviewed by: Jason King <jason.king@joyent.com> Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Jerry Jelinek <jerry.jelinek@joyent.com>
2017-09-22 [illumos-gate merge]Jerry Jelinek12-0/+487
commit 42b14111721da2ebd5159e7b45012a3eb0e3384c 8648 Fix range locking in ZIL commit codepath commit bd9d3f904625846bdc61af8897a1072029c7aeb7 8661 remove "zil-cw2" dtrace probe commit 2840dce1a029098fb784afd951d5f98089f850d8 8600 ZFS channel programs - snapshot commit 000cce6b6fad4a8b0eecef6e1251f6aca1719c55 8592 ZFS channel programs - rollback commit 1c18e8fbd8db41a9fb39bd3ef7a18ee71ece20da 8502 illumos#7955 broke delegated datasets when libshare is not present commit 5f82aa32fbc5dc2c59bca6ff315f44a4c4c9ea86 8595 sys/ccompile.h: add __aligned and __packed 8596 iwn: remove local __packed 8597 grub: use __aligned from ccompile.h commit d042c5a26452797afc4fe8c2ceddebff94d88745 8591 Man pages contain various errors
2017-09-218600 ZFS channel programs - snapshotChris Williamson10-0/+375
Reviewed by: Matthew Ahrens <mahrens@delphix.com> Reviewed by: John Kennedy <john.kennedy@delphix.com> Reviewed by: Brad Lewis <brad.lewis@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com>
2017-09-218592 ZFS channel programs - rollbackBrad Lewis2-0/+112
Reviewed by: Chris Williamson <chris.williamson@delphix.com> Reviewed by: Matthew Ahrens <mahrens@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com>
2017-09-19OS-6341 bunyan_child adds keys to parent, not childOS-6341Jason King1-0/+4
2017-09-18 [illumos-gate merge]Jerry Jelinek2-0/+71
commit ed992b0aac4e5b70dc1273b1d055c0d471fbb4b1 8604 Avoid unnecessary work search in VFS when unmounting snapshots commit 5f39f884e2035d671ec02148fc4d8420c670bcb4 8605 zfs channel programs: zfs.exists undocumented and non-working commit 2bcb5458541cc6e8bf7dc541303da29297b82e8b 8602 remove unused "dp_early_sync_tasks" field from "dsl_pool" structure commit c861bfbd77c4ae780a0341e9cb6926d8b74341cf 8567 Inconsistent return value in zpool_read_label commit a141dbd6230b88bf7da3b673ca0f9b46918d5684 8655 remove more gender specific language commit 30acb30daf662150e9e016113303bd74f2379dfc 8626 make pcplusmp and apix warning-free Conflicts: usr/src/uts/i86pc/io/pcplusmp/apic_introp.c usr/src/uts/i86pc/io/mp_platform_misc.c
2017-09-158605 zfs channel programs: zfs.exists undocumented and non-workingChris Williamson2-0/+71
Reviewed by: Paul Dagnelie <pcd@delphix.com> Reviewed by: Dan Kimmel <dan.kimmel@delphix.com> Reviewed by: Matt Ahrens <mahrens@delphix.com> Approved by: Robert Mustacchi <rm@joyent.com>