Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
|
|
|
|
Merge https://github.com/illumos/illumos-gate
Conflicts:
exception_lists/packaging
usr/src/cmd/dtrace/test/cmd/scripts/dtest.pl
usr/src/cmd/dtrace/test/tst/common/usdt/tst.badguess.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.enabled2.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess32.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.guess64.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.include.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.nodtrace.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh
usr/src/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh
usr/src/cmd/lp/Makefile
usr/src/cmd/lp/cmd/lpadmin/options.c
usr/src/cmd/lp/cmd/lpfilter.c
usr/src/cmd/lp/cmd/lpforms.c
usr/src/cmd/lp/cmd/lpusers.c
usr/src/cmd/lp/lib/lp/isterminfo.c
usr/src/cmd/lp/lib/lp/tidbit.c
usr/src/cmd/terminfo/att.ti
usr/src/cmd/zpool/zpool_main.c
usr/src/common/dis/i386/dis_tables.c
usr/src/lib/libdtrace/common/dt_options.c
usr/src/lib/libzfs/common/libzfs_dataset.c
usr/src/man/man1m/dladm.1m
usr/src/man/man1m/flowadm.1m
usr/src/man/man1m/zoneadm.1m
usr/src/man/man1m/zonecfg.1m
usr/src/pkg/manifests/print-lp-print-client-commands.mf
usr/src/pkg/manifests/print-lp.mf
usr/src/uts/common/fs/zfs/sys/zio.h
usr/src/uts/common/fs/zfs/zio.c
usr/src/uts/i86pc/ml/mach_offsets.in
usr/src/uts/intel/amd64/ml/mach_offsets.in
usr/src/uts/intel/sys/tss.h
|
|
Conflicts:
usr/src/cmd/lp/cmd/lpadmin/options.c
usr/src/cmd/man/src/man.c
|
|
|
|
|
|
Reviewed by: Garrett D'Amore <garrett@nexenta.com>
Reviewed by: Albert Lee <trisk@opensolaris.org>
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Garrett D'Amore <garrett@nexenta.com>
|
|
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
|
|
|
|
|
|
6930656 license action improvements
--HG--
rename : usr/src/cmd/cmd-inet/usr.bin/pppdump/LICENSE.top.descrip => usr/src/cmd/cmd-inet/usr.bin/pppdump/THIRDPARTYLICENSE.descrip
rename : usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd
rename : usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.descrip => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.bsd.descrip
rename : usr/src/pkg/license_files/lic_SUNWroute => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd
rename : usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.descrip => usr/src/cmd/cmd-inet/usr.sbin/in.routed/THIRDPARTYLICENSE.freebsd.descrip
rename : usr/src/pkg/license_files/lic_SUNWhwdata => usr/src/cmd/hwdata/THIRDPARTYLICENSE.pciids.tmpl
rename : usr/src/pkg/license_files/lic_GPLv2 => usr/src/cmd/powertop/common/COPYING
rename : usr/src/lib/librstp/THIRDPARTYLICENSE.descrip => usr/src/lib/librstp/common/COPYING.descrip
rename : usr/src/uts/common/io/e1000g/README => usr/src/uts/common/io/e1000g/THIRDPARTYLICENSE
rename : usr/src/pkg/license_files/lic_Emulex => usr/src/uts/common/io/fibre-channel/fca/emlxs/FIRMWARELICENSE
rename : usr/src/pkg/license_files/lic_Qlogic => usr/src/uts/common/io/fibre-channel/fca/qlc/FIRMWARELICENSE
rename : usr/src/uts/common/io/ib/clients/of/lic_of => usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE
rename : usr/src/uts/common/io/ib/clients/of/lic_of.descrip => usr/src/uts/common/io/ib/clients/of/THIRDPARTYLICENSE.descrip
rename : usr/src/pkg/license_files/cr_Intel.SUNWfipe => usr/src/uts/i86pc/io/fipe/THIRDPARTYLICENSE
|
|
PSARC/2010/271 EOF and removal of installgrub(1m) floppy support
6944352 prevent downgrading the boot block on update on multi-BE environments
6972371 EOF and removal of installgrub(1m) floppy support [PSARC/2010/271]
--HG--
rename : usr/src/cmd/boot/installgrub/floppy.c => usr/src/cmd/boot/installgrub/pcfs_glue.c
|
|
|
|
6825126 zfs snapshot can fail with EBUSY due to unplayed logs
|
|
--HG--
rename : usr/src/cmd/sgs/libelf/common/mapfile-common => usr/src/cmd/sgs/libelf/common/mapfile-vers
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-bindings => usr/src/cmd/sgs/link_audit/common/mapfile-vers-bindings
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-perfcnt => usr/src/cmd/sgs/link_audit/common/mapfile-vers-perfcnt
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-symbindrep => usr/src/cmd/sgs/link_audit/common/mapfile-vers-symbindrep
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-truss => usr/src/cmd/sgs/link_audit/common/mapfile-vers-truss
rename : usr/src/cmd/sgs/link_audit/i386/mapfile-vers-who => usr/src/cmd/sgs/link_audit/common/mapfile-vers-who
rename : usr/src/common/mapfiles/i386/map.noexdata => usr/src/common/mapfiles/common/map.noexdata
rename : usr/src/lib/libaio/sparc/mapfile-vers => usr/src/lib/libaio/common/mapfile-vers
rename : usr/src/lib/libelfsign/common/mapfile.map => usr/src/lib/libelfsign/common/mapfile-vers
rename : usr/src/lib/libpthread/sparc/mapfile-vers => usr/src/lib/libpthread/common/mapfile-vers
rename : usr/src/lib/librt/amd64/mapfile-vers => usr/src/lib/librt/common/mapfile-vers
rename : usr/src/lib/libsys/sparc/mapfile-vers => usr/src/lib/libsys/common/mapfile-vers
rename : usr/src/lib/libthread/sparc/mapfile-vers => usr/src/lib/libthread/common/mapfile-vers
|
|
|
|
individual disk.
6683750 scrub -s have to wait until resilver completed?
6841252 Resilvering not restartable - causing an excess reboot delay
6855073 spa scrub stats (eg %done) are reset on reboot
6891824 7410 NAS head "continually resilvering" following HDD replacement
6899970 scrub/resilver percent complete reporting in zpool status can be overly optimistic
6940889 add interval (count) args to zpool list
6944623 dbuf_read_done() locking performance improvement
6946760 mutex problem in bplist_enqueue()
6391915 RFE: provide interval arg to zpool status to monitor resilvering
6946512 want zfs_send() to pass back debug info
6943992 'zpool scrub' should not restart the existing scrub silently
6878281 zpool should store the time of last scrub/resilver and other zpool status info in pool properties.
6935158 Assertion failed: used <= spa_get_dspace(dd->dd_pool->dp_spa)
6944388 dsl_dataset_snapshot_reserve_space() causes dp_write_limit=max
--HG--
rename : usr/src/uts/common/fs/zfs/dsl_scrub.c => usr/src/uts/common/fs/zfs/dsl_scan.c
|
|
|
|
libfsimage/pygrub
|
|
6516171 zpl symlinks should have their own object type
|
|
6388458 zil need not inflate blocksize that much
6738159 slog can probably pack 2X more data per lwb
6897432 ziltest_noslog fails after dedup putback
6911570 Shouldn't start an ereport on speculative read failure
6920442 ZIL: Should use the stronger checksum fletcher4
|
|
|
|
6850025 want to preserve local properties for zfs_recv
6839260 want zfs send with properties
6855486 zfs_receive should keep trying to set properties even after some fail
6850030 snapshots on read-only dataset shouldn't affect zfs_receive
|
|
|
|
6677093 zfs should have dedup capability
|
|
|
|
6856566 zpool import -F can cause panic
6863456 system panic by load_nvlist(spa, spa->spa_config_object, &nv) == 0 while running zfs test suite
6882947 dump_nvlist() should live in libnvpair
|
|
6803121 want user-settable refcounts on snapshots
6851824 zfs_ioc_rename() can be called with a NULL zc_name
|
|
|
|
|
|
6854621 RAID-Z should mind the gap on writes
|
|
6819150 add back label support in GRUB/zfs code
6837148 set_bootfs() returns garbage
|
|
take care of spare vdev
6844158 assertion failed: vd->vdev_ops == &vdev_mirror_ops, file: ../../common/fs/zfs/zvol.c, line: 1054
6846024 allow grub to findroot /boot/grub/menu.lst if opening menu.lst from the boot device fails
|
|
|
|
6837608 zpool upgrade -V usage not correct
|
|
6805596 spa_check_rootconf panics if it finds a disk with a destroyed pool
6828083 spa_check_rootconf doesn't always get its devid
|
|
|
|
6501037 want user/group quotas on ZFS
6830813 zfs list -t all fails assertion
6827260 assertion failed in arc_read(): hdr == pbuf->b_hdr
6815592 panic: No such hold X on refcount Y from zfs_znode_move
6759986 zfs list shows temporary %clone when doing online zfs recv
|
|
|
|
option 150
|
|
|
|
grub> prompt
|
|
Contributed by Richard Lowe
6785284 Mapfile versioning rules need to be more visible to gatelings
6800164 Standard file exclusion mechanism needed for Cadmium tools
|
|
6794934 GRUB overlay logo code should be removed
|
|
|
|
GANG Block support
|
|
6779026 GRUB: XPM color parsing code should be a little smarter
6779852 GRUB: menu.lst processing is broken
|
|
|