Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity
16,449 Commits 42 Branches 132 Tags 226 MiB
Commit Graph

1358 Commits

Author SHA1 Message Date
Brian Behlendorf 81609e1773 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-14 15:59:46 -07:00
Brian Behlendorf f4f805a70e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-10-14 15:59:13 -07:00
Brian Behlendorf 84ed1fee34 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-10-14 15:59:11 -07:00
Brian Behlendorf aa587c8437 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-14 15:57:13 -07:00
Brian Behlendorf 085ed9fe82 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-10-14 15:57:10 -07:00
Brian Behlendorf cb678c0b31 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-10-14 15:57:09 -07:00
Brian Behlendorf a8adb61c00 Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-10-14 15:57:08 -07:00
Brian Behlendorf 8a905e7dcc Update vtoc.h header and add missing mhd.h header needed by libefi. 2009-10-14 15:52:24 -07:00
Brian Behlendorf 39d85a8b94 Remove pragmas from new libefi files. 2009-10-14 15:44:22 -07:00
Brian Behlendorf 00c6a706a5 Refresh autogen products 2009-10-09 16:46:19 -07:00
Brian Behlendorf 8dc5609e72 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 16:44:47 -07:00
Brian Behlendorf 9fb47da60f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-10-09 16:44:10 -07:00
Brian Behlendorf 8b6b31f3e4 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-09 16:42:09 -07:00
Brian Behlendorf cb91bbe6ce Additional set of build system tweaks for libefi library. 2009-10-09 16:37:32 -07:00
Brian Behlendorf f0ac8537ff Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 16:23:16 -07:00
Brian Behlendorf cae4a99504 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-10-09 16:23:13 -07:00
Brian Behlendorf d7e242199c Header efi_partition.h moved to lib/libefi/include/sys/ 2009-10-09 16:18:39 -07:00
Brian Behlendorf 28cdfd90ef Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 16:13:31 -07:00
Brian Behlendorf fc2213dfac Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 
Conflicts:

	lib/Makefile.am
 2009-10-09 16:12:49 -07:00
Brian Behlendorf a740d2a8f7 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 
Conflicts:

	lib/Makefile.am
 2009-10-09 16:06:51 -07:00
Brian Behlendorf a0337cfcd8 Add libefi library in to the build system. 2009-10-09 15:58:45 -07:00
Brian Behlendorf b04c6f54b9 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 15:46:16 -07:00
Brian Behlendorf 746882c100 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-10-09 15:45:38 -07:00
Brian Behlendorf 90b0761a16 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-10-09 15:43:37 -07:00
Brian Behlendorf e0e0f0ea84 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-10-09 15:43:33 -07:00
Brian Behlendorf 9302f90662 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-10-09 15:42:56 -07:00
Brian Behlendorf 926a2e3cc4 Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 2009-10-09 15:42:48 -07:00
Brian Behlendorf 3728b6d9c1 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-10-09 15:42:16 -07:00
Brian Behlendorf 1b0e5a1485 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-10-09 15:42:15 -07:00
Brian Behlendorf 5c36312909 Script update-zfs.sh updated to include libefi library 2009-10-09 15:37:29 -07:00
Brian Behlendorf 0d8bb46b58 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-10-09 15:03:53 -07:00
Brian Behlendorf 6ef15db027 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-10-09 15:03:50 -07:00
Brian Behlendorf f73cff230f Reverting changes on linux-have-libefi topic branch. 2009-10-09 14:59:05 -07:00
Brian Behlendorf 92bb246ab4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-18 14:22:55 -07:00
Brian Behlendorf 547471e842 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-18 14:22:00 -07:00
Brian Behlendorf 87bdf80fb7 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-18 14:19:13 -07:00
Brian Behlendorf 147adbe815 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-08-18 14:18:40 -07:00
Brian Behlendorf e4b55cfbff Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 14:18:36 -07:00
Brian Behlendorf 5d83878f46 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 14:18:34 -07:00
Brian Behlendorf e134b976b6 Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch 2009-08-18 14:18:33 -07:00
Brian Behlendorf b29c1f87a0 Required build 121 updates for gcc-missing-braces 2009-08-18 14:08:46 -07:00
Brian Behlendorf ae556c9174 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-08-18 13:01:34 -07:00
Brian Behlendorf 3e17f18dcc Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-18 12:35:43 -07:00
Brian Behlendorf 2d067983d6 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-18 12:29:48 -07:00
Brian Behlendorf c67303e092 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 
Conflicts:

	lib/libzfs/libzfs_dataset.c
	module/zfs/dsl_dataset.c
	module/zfs/rrwlock.c
	module/zfs/spa_history.c
	module/zfs/zfs_ioctl.c
 2009-08-18 12:26:09 -07:00
Brian Behlendorf 50c623ccef Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-08-18 12:10:55 -07:00
Brian Behlendorf b99b422796 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-08-18 12:08:58 -07:00
Brian Behlendorf 41b297a27f Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces 2009-08-18 12:08:46 -07:00
Brian Behlendorf abd8fdb94f Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas 
Conflicts:

	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
 2009-08-18 12:08:36 -07:00
Brian Behlendorf e5e4fadc34 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/dmu.c
	module/zfs/dsl_deleg.c
	module/zfs/rrwlock.c
	module/zfs/vdev_raidz.c
 2009-08-18 12:04:53 -07:00