OpenZFS on Linux and FreeBSD
Go to file
Brian Behlendorf a082023842 Merge commit 'refs/top-bases/feature-branch' into feature-branch
Conflicts:
	cmd/ztest/ztest.c
	lib/libzpool/include/sys/zfs_context.h
	lib/libzpool/kernel.c
	lib/libzpool/taskq.c
2010-05-27 13:30:48 -07:00
cmd Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-27 13:30:48 -07:00
lib Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-27 13:30:48 -07:00
man/man8 Pull in latest man pages as part of update-zfs.sh 2009-12-11 16:15:33 -08:00
module Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:25:20 -07:00
scripts Update nvpair's to include nv_alloc_fixed support 2010-04-29 11:59:41 -07:00
.gitignore Ignore unsigned module build products 2010-03-09 14:14:09 -08:00
.topdeps New TopGit dependency: feature-pthreads 2009-03-19 20:51:17 -07:00
.topmsg Recreate feature-branch to simply feature merge 2008-12-03 12:47:38 -08:00
AUTHORS Add AUTHORS to master branch 2010-05-18 14:55:01 -07:00
COPYING Relocate COPYING+COPYRIGHT, remove README cruft 2008-12-01 15:34:53 -08:00
COPYRIGHT Update COPYRIGHT to reference zpios CDDL exceptions. 2010-05-18 14:25:28 -07:00
DISCLAIMER Update COPYRIGHT and DISCLAIMER. 2010-05-18 10:32:23 -07:00
GIT Refresh type in topgit git://* reference 2009-01-26 21:58:32 -08:00
OPENSOLARIS.LICENSE Add CDDL license file 2008-12-01 14:49:34 -08:00
ZFS.RELEASE Rebase master to b121 2009-08-18 11:43:27 -07:00