#
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>
|
#
24fe0b3b |
| 30-Jul-2009 |
jmcp <James.McPherson@Sun.COM> |
6864230 hiho, hiho, it'ch chtime for CH to go Portions contributed by Rich Lowe
|
#
7c478bd9 |
| 14-Jun-2005 |
stevel@tonic-gate <none@none> |
OpenSolaris Launch
|