| #
0b42f15a |
| 02-Oct-2013 |
Simon Klinkert <klinkert@webgods.de> |
Merge remote-tracking branch 'illumos-ml/master' into titanic
Some zev merge conflicts fixed.
Conflicts:
usr/src/uts/common/fs/zfs/zfs_ioctl.c
usr/src/uts/common/fs/zfs/zvol.c
|
| #
494f7e12 |
| 18-Jul-2013 |
Keith M Wesolowski <wesolows@foobazco.org> |
3915 Add adjuncts support to the build
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Richard Lowe <richlowe@richlowe.net>
Approved by: Dan McDonald <danmcd@nexenta.com>
|
| #
7014882c |
| 22-Jul-2012 |
Richard Lowe <richlowe@richlowe.net> |
2933 compiler warning gags need better granularity
Reviewed by: Eric Schrock <eric.schrock@delphix.com>
Approved by: Garrett D'Amore <garrett@damore.org>
|
| #
6a634c9d |
| 19-Aug-2010 |
Richard Lowe <richlowe@richlowe.net> |
merge with onnv_147
Reviewed by: garrett@nexenta.com
Approved by: garrett@nexenta.com
|
| #
efd4c9b6 |
| 17-Aug-2010 |
Steve Lawrence <Stephen.Lawrence@oracle.COM> |
PSARC/2010/291 zonestat
6871288 integrate zones observability phase 1
6976077 zoneadmd dumps core after restart
|