#
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
|
#
b6805bf7 |
| 24-Aug-2013 |
Gordon Ross <gwr@nexenta.com> |
4072 make clobber leaves trash Reviewed by: Albert Lee <trisk@nexenta.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Marcel Telka <marcel.telka@nexenta.com> Reviewed by: Richard Low
4072 make clobber leaves trash Reviewed by: Albert Lee <trisk@nexenta.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Marcel Telka <marcel.telka@nexenta.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Garrett D'Amore <garrett@damore.org>
show more ...
|
#
24fe0b3b |
| 30-Jul-2009 |
jmcp <James.McPherson@Sun.COM> |
6864230 hiho, hiho, it'ch chtime for CH to go Portions contributed by Rich Lowe
|
#
49f0e518 |
| 09-May-2006 |
marks <none@none> |
6421216 ufsrestore should use acl_set() for setting ACLs
|
#
7c478bd9 |
| 14-Jun-2005 |
stevel@tonic-gate <none@none> |
OpenSolaris Launch
|