Age | Commit message (Collapse) | Author | Files | Lines |
|
commit 30925561c223021e91d15899cbe75f80e54d8889
5745 zfs set allows only one dataset property to be set at a time
commit 643da460c8ca583e39ce053081754e24087f84c8
5765 add support for estimating send stream size with lzc_send_space when source is a bookmark
commit dc5f28a3c341db7c241bba77ddc109c141072f27
5764 "zfs send -nv" directs output to stderr
commit 1c445679611e2f17e31e163f4eeb49f65c99d191
5794 Add reference to RFC 5903 to ike.config(4)
commit 4bc492d2bb45bc1a51b553ae441cfee4289cb3ee
5775 mr_sas initialisation pauses unecessarily for 60 seconds.
|
|
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Bayard Bell <buffer.g.overflow@gmail.com>
Reviewed by: Richard PALO <richard@NetBSD.org>
Reviewed by: Steven Hartland <killing@multiplay.co.uk>
Approved by: Rich Lowe <richlowe@richlowe.net>
|
|
commit 5ff8cfa92ec8ea0f8593ad21aa2a04829b0ef5ea
5410 Document -S option to zfs inherit
5412 Mention -S option when zfs inherit fails on quota
commit bc9014e6a81272073b9854d9f65dd59e18d18c35
5056 ZFS deadlock on db_mtx and dn_holds
|
|
5412 Mention -S option when zfs inherit fails on quota
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
commit 1ed6b69a5ca1ca3ee5e9a4931f74e2237c7e1c9f
5316 allow smbadm join to use RPC
commit 177d5b5f8c0e969013441207a0a705ae66b08cf7
5331 want sockaddr(3SOCKET)
Manifests:
usr/src/pkg/manifests/system-library.man3socket.inc
|
|
Reviewed by: Bayard Bell <bayard.bell@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Thomas Keiser <thomas.keiser@nexenta.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Robert Mustacchi <rm@joyent.com>
|
|
commit b515258426fed6c7311fd3f1dea697cfbd4085c6
5027 zfs large block support
commit f3477bb2505a35e160b09c9dbf5476112be4fa7d
4457 we apparently change .comment of almost every userland object
commit 738f37bc3dcd61e8a893af0f2d466d76690b70ec
5244 zio pipeline callers should explicitly invoke next stage
commit f7950bf1145637c6dc57742a8bb95631fd5c846f
5243 zdb -b could be much faster
commit cffcfaee1e6b29ef9ceb7d80e4e053ffd029906b
5270 ld(1) cannot handle CIE version 3 in .eh_frame
Conflicts:
usr/src/man/man1m/zfs.1m
|
|
Reviewed by: Alek Pinchuk <pinchuk.alek@gmail.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Josef 'Jeff' Sipek <josef.sipek@nexenta.com>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Reviewed by: Saso Kiselkov <skiselkov.ml@gmail.com>
Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Dan McDonald <danmcd@omniti.com>
|
|
commit 7d46dc6ca63a6f3f0d51aa655bfcf10cf2405a9e
4951 ZFS administrative commands should use reserved space, not fail with ENOSPC
commit cd67d23d32df7b247d00e5b82257a2220b1e0c13
4966 zpool list iterator does not update output
|
|
Reviewed by: John Kennedy <john.kennedy@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
commit 06315b795c0d54f0228e0b8af497a28752dd92da
4881 zfs send performance degradation when embedded block pointers are encountered
commit 7fd05ac4dec0c343d2f68f310d3718b715ecfbaf
4390 i/o errors when deleting filesystem/zvol can lead to space map corruption
commit 5d7b4d438c4a51eccc95e77a83a437b4d48380eb
4757 ZFS embedded-data block pointers ("zero block compression")
4913 zfs release should not be subject to space checks
Conflicts:
usr/src/man/man1m/zfs.1m
|
|
4913 zfs release should not be subject to space checks
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Max Grossman <max.grossman@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>
|
|
commit 7dbbcd8300f0241d3ec9686f2a0a06107c1b90cb
4573 ZFS snapshot alias
commit 709ee7cac5ff7cd991f4b21face672a23a7409a5
4622 asy.conf interrupt configuration broken
|
|
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Dan McDonald <danmcd@omniti.com>
Approved by: Dan McDonald <danmcd@omniti.com>
|
|
commit 8b36997aa24d9817807faa4efa301ac9c07a2b78
4391 panic system rather than corrupting pool if we hit bug 4390
commit 78f171005391b928aaf1642b3206c534ed644332
4369 implement zfs bookmarks
4368 zfs send filesystems from readonly pools
commit 973c78e94bf9634782164382c9e291bf81161fa5
4121 vdev_label_init should treat request as succeeded when pool is read only
Conflicts:
usr/src/man/man1m/zfs.1m
usr/src/lib/libzfs/common/mapfile-vers
usr/src/lib/libzfs/common/libzfs_impl.h
usr/src/cmd/zfs/zfs_main.c
|
|
4368 zfs send filesystems from readonly pools
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
commit f38cb554a534c6df738be3f4d23327e69888e634
4206 history_003_pos relies on exact size of history log and entries
4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
|
|
4207 history_008_pos depends on obsolete internal history log message
4208 Typo in zfs_main.c: "posxiuser"
4209 Populate zfstest with the remainder of the STF tests
Reviewed by: Sonu Pillai <sonu.pillai@delphix.com>
Reviewed by: Will Guyette <will.guyette@delphix.com>
Reviewed by: Eric Diven <eric.diven@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
merge breakage)
|
|
commit 97adda444bedd8afa322c1d2233957d40bc8e35c
4226 mountd(1m) could run out of file descriptors
commit 7140fde549ff65142379ea6e25e6276552e22f3f
4307 Variable is used before it is initialized in kwarndtest.c
commit 43d68d68c1ce08fb35026bebfb141af422e7082e
2583 Add -p (parsable) option to zfs list
Conflicts:
usr/src/cmd/zfs/zfs_main.c
usr/src/cmd/fs.d/nfs/mountd/mountd.c
|
|
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Gordon Ross <gwr@nexenta.com>
|
|
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Gordon Ross <gwr@nexenta.com>
|
|
OS-2378 OS-2358 fix causes snapshot -r to fail during recv
|
|
commit a7a845e4bf22fd1b2a284729ccd95c7370a0438c
3740 Poor ZFS send / receive performance due to snapshot hold / release processing
|
|
processing
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Approved by: Christopher Siden <christopher.siden@delphix.com>
|
|
commit aec3cf542eb81ffe3fe027b69143a82fdc7810cd
815 Need ipadm(1M) manual page
commit 3b2aab18808792cbd248a12f1edf139b89833c13
3464 zfs synctask code needs restructuring
commit 584d084a45d320c86a541cf9072cccd91b4da17b
3426 assertion failed: irq < 16 on VMware hardware version 9 (apix related)
commit ec94d32216ed5705f5176582355cc311cf848e73
3581 spa_zio_taskq[ZIO_TYPE_FREE][ZIO_TASKQ_ISSUE]->tq_lock is piping hot
commit 62eae88769b9eacda11c5d508d9d87deeaf0821c
3543 Feature flags causes assertion in spa.c to miss certain cases
commit 77372cb0f35e8d3615ca2e16044f033397e88e21
3588 provide zfs properties for logical (uncompressed) space used and referenced
commit 03f8c366886542ed249a15d755ae78ea4e775d9d
3552 condensing one space map burns 3 seconds of CPU in spa_sync() thread (fix race condition)
Conflicts:
usr/src/cmd/zfs/zfs_main.c
usr/src/man/man1m/Makefile
usr/src/man/man1m/ipadm.1m
usr/src/uts/common/fs/zfs/zfs_ioctl.c
|
|
Reviewed by: Dan Kimmel <dan.kimmel@delphix.com>
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
* github.com:illumos/illumos-gate: (49 commits)
commit c61ea5668634a215fd1c9000beb7f6d2853b3468
3557 dumpvp_size is not updated correctly when a dump zvol's size is changed
3558 setting the volsize on a dump device does not return back ENOSPC
3559 setting a volsize larger than the space available sometimes succeeds
3560 dumpadm should be able to remove a dump device
commit 9eb57f7f3fbb970d4b9b89dcd5ecf543fe2414d5
3578 transferring the freed map to the defer map should be constant time
3579 ztest trips assertion in metaslab_weight()
commit 9583f7179cb3bb19c38f4a8567cb8d51786036f1
3501 mdb: ::thread -d needs the SWITCH column
commit 870e339d55f32bf17ce54ee9557ef0ac88ab4d5f
3496 sysevent runtime files are under /var/run
commit 03205638622365000528794a52a1c0a8e846554e
3431 sharectl prints garbage when it failed
commit cfe63ebf3593a7e45618955bfd1a754f30fc5fcf
3412 The ascii art in nfs4.h needs update
commit 11bb729e438c0522ef1254effe8c8a39e441d7d5
1927 nfs4 stale clientid loop (OI server, Linux client)
commit 28f2c52052034474a5881e13013564f72ffa345f
3515 sd gives RMW warnings for reads
commit 16a4a8074274d2d7cc408589cf6359f4a378c861
3552 condensing one space map burns 3 seconds of CPU in spa_sync() thread
3564 spa_sync() spends 5-10% of its time in metaslab_sync() (when not condensing)
3566 recursive mutex panic in specfs
commit 20128a0826f9c53167caa9215c12f08beee48e30
3561 arc_meta_limit should be exposed via kstats
3116 zpool reguid may log negative guids to internal SPA history
commit c3a66015199e1814c2af8f7e6929af2004302e7e
3537 want pool io kstats
commit ccc71be50bb49efb4e31004c77fb3e065e9c0596
3523 SMB NT Notify returning too soon
commit bfbce3c1273efa22c185ea2995c57c37163fd7c3
3223 SMB FindFirst/FindNext don't fill in Last Name Offset
commit 42c141d3747f50c9bfb13e3cf5f32828312a7b79
374 cron should send more useful mail
commit 1f9f06cf154565efc5425d8e2c4d511ea99b0a58
3529 iostat should display time used by dtrace
commit d5285cae913f4e01ffa0e6693a6d8ef1fbea30ba
3522 zfs module should not allow uninitialized variables
commit 7535ae1914017b0e648abd7a139aca709fa82be3
3503 usba doesn't initialize cc_no_resources, causes gibberish output in kstat:
commit e5dc7eac9e55f81548c4f12c8a2879d42a35ad84
3531 Race between log_sysevent_filename() and log_event_upcall() can cause panic
commit 644b952899ad74c91b80401bc5cec525cdd9d87f
3512 rounding discrepancy in sa_find_sizes()
3513 mismatch between SA header size and layout
commit 43ae55058ad99c869a9ae39d039490e8a3680520
3534 Disable EEE support in igb for I350
commit 838d71726afbdb6e9ea1358597d7a2da477d6831
3535 mdb ::print should pretty-print ipaddr_t and friends
commit 15c4b7fc60958757a4ae2244a3910f06c3308202
3305 smbfs mount shows password
commit 9dc3941c735ef88de46e850f745aa556d3a071a5
3507 Tunable to allow block allocation even on degraded vdevs
commit e98f46cc16b6ba1555409cb3c7e384bdb0792875
3519 DTrace fails to resolve const types from fbt
3520 dtrace internal error -- token type 316 is not a valid D compilation token
3521 clean up dtrace unit tests
commit db8a3845f437a4151d759cc8d253e54e2911d7e6
3516 Leftover multidata transmit kernel statistics in ipv6
commit fabf08ae7a95a47c3e249ee651d83d26f798bcfa
3514 Spurious errors setting up new SMB client sessions
commit 1b912ec7100c10e7243bf0879af0fe580e08c73d
3498 panic in arc_read(): !refcount_is_zero(&pbuf->b_hdr->b_refcnt)
commit aea676fd5203d93bed37515d4f405d6a31c21509
3508 NFS4 data corruption (client side)
commit c93cc65a53e442bf8f9292f82e8c0797e0ed3f3d
3511 dtrace.c erroneously checks for memory alignment on amd64
commit 39f633a09e54fab2b9cf8d9d3ddc2a043b3e7465
3325 nsmb_close locking and teardown deadlock
commit 28e4da25922bdfc5cba7ab29f47de911bbd78009
3465 ::walk ... | ::<dcmd> misinterprets input as symbol names
3466 ::tsd should handle missing/NULL values better
3467 mdb_ctf_vread() could be more useful
3468 mdb enhancements for zfs development
3470 ::whatis does not print callers from KMF_LITE
3473 mdb_get_module() returns wrong module
commit 52fd7480cd8cd8da8ccac00d6af67471a23f06d2
3371 dumpadm -z is not documented in manpage
3380 zfs man page: documentation for zfs allow is confusing
commit a0900badd8eb6bcca99411c8906b483e84f2da91
3196 ao_gendisp use by make is racey
commit ff512403afa294019aee0a9c4e4f778f1d7ed207
3237 r10 is added 2 times to panic info
commit 4846df9b53c813b173160a71c267f6678e9bf59b
3502 panic in smb_server_shutdown (sl_count assertion)
commit 5f1ef25c7a11451cbd3080dc3ce8e8db4ca996c4
604 CIFS server should traverse child mount points
commit e633f2d79475b51f0a4d46972282225abf851733
749 "/usr/bin/kstat" should be rewritten in C (fix SPARC build)
commit 66448911ac89c254e89afc52e114402115a497e3
749 "/usr/bin/kstat" should be rewritten in C
commit b17f03d7d89b75b69b9b7db22f2316b700e3a5a8
3485 statd is not handling incoming SM_NOTIFY properly when the hostname is not resolvable
commit b7c47e8c412d4654019e45625cf2be8f7fd6ee66
3492 some e1000g devices don't support 15 unicast addresses
commit 452fab4bfe0f4a0322a258885624366426683ae8
3419 usbftdi needs to support the BeagleBone
commit 33c41f2b7f5e60517664bd7f392221865f833526
3477 SunSSH config should accept TCPKeepAlive as synonym for KeepAlive
commit 3c1e517454d5ef05eda14277b3af58472e9b26a9
452 getconf should support NPROCESSORS_*
commit c92bf99ee60c0b1fe1289fef2b4034126c7867a5
3474 tar should support -C on extract
commit a6f561b4aee75d0d028e7b36b151c8ed8a86bc76
3035 LZ4 compression support in ZFS and GRUB
commit 7b1753e64ab6c8c68e7cd79acbedfdfba12bd7f8
3444 README for usr/src/test
3445 ZFS tests for restricted aclmode
Conflicts:
usr/src/cmd/cron/cron.c
usr/src/cmd/mdb/common/mdb/mdb_ctf.c
usr/src/cmd/mdb/common/mdb/mdb_ctf.h
usr/src/cmd/ssh/libssh/common/readconf.c
usr/src/cmd/ssh/sshd/servconf.c
usr/src/cmd/stat/Makefile
usr/src/common/zfs/zfeature_common.c
usr/src/common/zfs/zfeature_common.h
usr/src/common/zfs/zfs_prop.c
usr/src/man/man1m/zfs.1m
usr/src/man/man4/ssh_config.4
usr/src/man/man4/sshd_config.4
usr/src/man/man5/zpool-features.5
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/io/scsi/targets/sd.c
|
|
3558 setting the volsize on a dump device does not return back ENOSPC
3559 setting a volsize larger than the space available sometimes succeeds
3560 dumpadm should be able to remove a dump device
Reviewed by: Adam Leventhal <ahl@delphix.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: Christopher Siden <christopher.siden@delphix.com>
Approved by: Albert Lee <trisk@nexenta.com>
|
|
|
|
|
|
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
3028 zfs {group,user}space -n prints (null) instead of numeric GID/UID
3048 zfs {user,group}space [-s|-S] is broken
3049 zfs {user,group}space -t doesn't really filter the results
3060 zfs {user,group}space -H output isn't tab-delimited
3061 zfs {user,group}space -o doesn't use specified fields order
3093 zfs {user,group}space's -i is noop
Reviewed by: Garry Mills <gary_mills@fastmail.fm>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
Merge github.com:illumos/illumos-gate
Conflicts:
exception_lists/check_rtime
usr/src/Makefile.master
usr/src/Makefile.master.64
usr/src/cmd/Makefile
usr/src/cmd/lms/Makefile
usr/src/cmd/lp/Makefile.lp
usr/src/cmd/mdb/Makefile.mdb
usr/src/cmd/mdb/common/mdb/mdb_cmds.c
usr/src/cmd/mdb/common/mdb/mdb_print.c
usr/src/cmd/mdb/common/mdb/mdb_print.h
usr/src/cmd/mdb/common/mdb/mdb_tab.c
usr/src/cmd/mdb/common/mdb/mdb_termio.c
usr/src/cmd/mdb/common/mdb/mdb_whatis.c
usr/src/cmd/svc/svccfg/svccfg_libscf.c
usr/src/cmd/zpool/zpool_main.c
usr/src/lib/Makefile
usr/src/lib/libc/inc/thr_inlines.h
usr/src/lib/libc/port/mapfile-vers
usr/src/lib/libc/sparc/Makefile.com
usr/src/lib/libc/sparc/crt/_rtld.c
usr/src/lib/libc/sparcv9/Makefile.com
usr/src/lib/libdtrace/common/dt_open.c
usr/src/lib/libdtrace/common/dt_options.c
usr/src/lib/libumem/common/envvar.c
usr/src/lib/libumem/common/vmem_base.c
usr/src/lib/libzfs/common/libzfs_impl.h
usr/src/lib/libzfs/common/libzfs_iter.c
usr/src/lib/libzfs/common/libzfs_util.c
usr/src/lib/libzfs/common/mapfile-vers
usr/src/lib/sun_fc/Makefile.com
usr/src/lib/sun_fc/amd64/Makefile
usr/src/lib/sun_fc/sparcv9/Makefile
usr/src/man/man1m/Makefile
usr/src/uts/common/Makefile.files
usr/src/uts/common/dtrace/dtrace.c
usr/src/uts/common/fs/zfs/arc.c
usr/src/uts/common/fs/zfs/dmu.c
usr/src/uts/common/fs/zfs/dsl_dataset.c
usr/src/uts/common/fs/zfs/dsl_pool.c
usr/src/uts/common/fs/zfs/sys/zio.h
usr/src/uts/common/io/fibre-channel/fca/fcoei/fcoei_eth.c
usr/src/uts/common/io/fibre-channel/fca/fcoei/fcoei_lv.c
usr/src/uts/common/sys/dtrace.h
|
|
2871 support for __ZFS_POOL_RESTRICT used by ZFS test suite
2903 zfs destroy -d does not work
2957 zfs destroy -R/r sometimes fails when removing defer-destroyed snapshot
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
|
|
|
|
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: George Wilson <George.Wilson@delphix.com>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
1788 "WARNING: Cannot lookup root device: /devices" is useless when rootfs is zfs
1828 powerd's "Able to open /dev/srn" notice is useless
2547 Minor updates to README
2678 zfs manpage mis-identifies checksum default value
2811 missing implementation: zfs send -r
3199 Update copyright years in usr/src/prototypes/
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
|
|
|
|
Reviewed by: Keith Wesolowski <keith.wesolowski@joyent.com>
|
|
Reviewed by: David Pacheco <dap@joyent.com>
|
|
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
Reviewed by: Kartik Mistry <kartik@nexenta.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Richard Elling <richard.elling@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: Steve Gonczi <gonczi@comcast.net>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
|
|
|
|
2883 changing "canmount" property to "on" should not always remount dataset
2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
|
|
Reviewed by: Matt Ahrens <matt@delphix.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
|
|
|