Age | Commit message (Collapse) | Author | Files | Lines |
|
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
|
|
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Jim Klimov <jim@cos.ru>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
|
|
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
|
|
eventually hang
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit 4263d13f00c9691fa14620eff82abef795be0693.
|
|
|
|
OS-919 prtconf should print out PCI database information
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.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>
|
|
openipmi driver
|
|
Reviewed by: Dan Kruchinin <dkruchinin@acm.org>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Gordon Ross <gwr@nexenta.com>
|
|
|
|
Reviewed by: Igor Khozhukhov <igor.khozhukhov@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Robert Mustacchi <rm@joyent.com>
|
|
|
|
Reviewed by: Igor Khozhukhov <igor.khozhukhov@nexenta.com>
Reviewed by: Albert Lee <trisk@nexenta.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: George Wilson <gwilson@zfsmail.com>
Reviewed by: Steve Gonczi <gonczi@comcast.net>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
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: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Yuri Pankov <yuri.pankov@gmail.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
OS-997 net_* and hook_* man pages are wrong
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Rob Gulewich <robert.gulewich@joyent.com>
Reviewed by: Brendan Gregg <brendan.gregg@joyent.com>
|
|
|
|
|
|
|
|
|
|
Merge git://github.com/illumos/illumos-gate
Conflicts:
usr/src/uts/common/inet/tcp/tcp_timers.c
usr/src/uts/common/io/mac/mac_sched.c
|
|
|
|
Reviewed by: Alexander Eremin <alexander.r.eremin@gmail.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Richard Elling <richard.elling@richardelling.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
1866 libsmbns is passing constant string to mktemp(3C)
1867 mktemp(3) gives bad advice in EXAMPLES section
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Approved by: Albert Lee <trisk@nexenta.com>
|
|
|
|
|
|
1866 libsmbns is passing constant string to mktemp(3C)
1867 mktemp(3) gives bad advice in EXAMPLES section
|
|
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>
|
|
2731 add -a --auto feature to tar for gtar comptability
Reviewed by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Bryan Cantrill <bryan@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Eric Schrock <eric.schrock@delphix.com>
|
|
|
|
2747 SPA versioning with zfs feature flags
Reviewed by: Matt Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <gwilson@delphix.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
Approved by: Eric Schrock <Eric.Schrock@delphix.com>
|
|
Reviewed by: David Hoeppner <0xffea@googlemail.com>
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Approved by: Garrett D'Amore <garrett@damore.org>
|
|
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.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>
|
|
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
2450 beadm umount should support mountpoint name
Reviewed by: Dan Kruchinin <dkruchinin@acm.org>
Reviewed by: Michael Schuster <michaelsprivate@gmail.com>
Reviewed by: Gary Mills <gary_mills@fastmail.fm>
Approved by: Gordon Ross <gwr@nexenta.com>
|
|
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Alexander Eremin <alexander.r.eremin@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
|
|
Reviewed by: David Höppner <0xffea@googlemail.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Albert Lee <trisk@nexenta.com>
Approved by: Albert Lee <trisk@nexenta.com>
|
|
|
|
Conflicts:
usr/src/cmd/abi/appcert/static_prof/static_prof.c
usr/src/cmd/hal/hald/hald_dbus.c
|