Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
OpenZFS on Linux and FreeBSD
44 Commits 42 Branches 132 Tags 226 MiB
C 70.3%
Shell 19.1%
Assembly 5.1%
M4 2.4%
Python 1.8%
Other 1.3%
Go to file
Brian Behlendorf a06a428e15 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 
Conflicts:

	cmd/zdb/zdb_il.c
	cmd/zinject/zinject.c
	lib/libzfs/libzfs_graph.c
	module/zcommon/include/sys/fm/fs/zfs.h
	module/zcommon/include/zfs_deleg.h
	module/zcommon/include/zfs_namecheck.h
	module/zcommon/zfs_deleg.c
	module/zcommon/zfs_namecheck.c
	module/zcommon/zprop_common.c
	module/zfs/dmu_object.c
	module/zfs/dsl_prop.c
	module/zfs/fletcher.c
	module/zfs/include/sys/dsl_deleg.h
	module/zfs/include/sys/dsl_prop.h
	module/zfs/include/sys/metaslab_impl.h
	module/zfs/include/sys/spa_boot.h
	module/zfs/include/sys/zap.h
	module/zfs/include/sys/zap_impl.h
	module/zfs/include/sys/zfs_context.h
	module/zfs/include/sys/zfs_ctldir.h
	module/zfs/include/sys/zfs_dir.h
	module/zfs/include/sys/zfs_fuid.h
	module/zfs/include/sys/zfs_ioctl.h
	module/zfs/spa_errlog.c
	module/zfs/spa_history.c
	module/zfs/zap.c
	module/zfs/zap_leaf.c
	module/zfs/zap_micro.c
 		2009-07-02 17:06:20 -07:00
cmd Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2009-07-02 17:06:20 -07:00
doc Finish removing all non-upstream bits from master 2008-12-01 16:15:29 -08:00
lib Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2009-07-02 17:06:20 -07:00
module Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2009-07-02 17:06:20 -07:00
scripts Add unicode library 2009-01-05 12:03:23 -08:00
.topdeps Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
.topmsg Update .topmsg for consistent with with gcc topic branches 2009-03-11 22:22:01 -07:00
COPYING Relocate COPYING+COPYRIGHT, remove README cruft 2008-12-01 15:34:53 -08:00
COPYRIGHT Relocate COPYING+COPYRIGHT, remove README cruft 2008-12-01 15:34:53 -08:00
DISCLAIMER Initial Linux ZFS GIT Repo 2008-11-20 12:01:55 -08: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 b117 2009-07-02 15:44:48 -07:00