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

10380 Commits

Author SHA1 Message Date
Brian Behlendorf d3bf596f03 Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch 2009-02-18 14:29:16 -08:00
Brian Behlendorf 56aabda0f9 Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks 2009-02-18 14:29:16 -08:00
Brian Behlendorf 463205c1bb Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2009-02-18 14:29:12 -08:00
Brian Behlendorf 15f5ddebdf Merge commit 'refs/top-bases/fix-pthreads' into fix-pthreads 
Conflicts:

	lib/libzpool/kernel.c
 2009-02-18 14:29:08 -08:00
Brian Behlendorf 0c0f306f14 Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch 2009-02-18 14:28:46 -08:00
Brian Behlendorf baf389bedc Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod 2009-02-18 14:28:46 -08:00
Brian Behlendorf 40839628e9 Merge branch 'fix-newlines' into refs/top-bases/fix-branch 2009-02-18 14:28:43 -08:00
Brian Behlendorf f3f9572ef9 Merge commit 'refs/top-bases/fix-newlines' into fix-newlines 2009-02-18 14:28:42 -08:00
Brian Behlendorf fa06351125 Merge branch 'fix-get-configs' into refs/top-bases/fix-branch 2009-02-18 14:28:39 -08:00
Brian Behlendorf 109a1d5b16 Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs 2009-02-18 14:28:38 -08:00
Brian Behlendorf 0dd5d4dae3 Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch 2009-02-18 14:28:34 -08:00
Brian Behlendorf 224985aa70 Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs 2009-02-18 14:28:34 -08:00
Brian Behlendorf e3f59d5034 Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2009-02-18 14:28:31 -08:00
Brian Behlendorf d6e8154947 Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t 2009-02-18 14:28:30 -08:00
Brian Behlendorf 145bd84478 Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch 2009-02-18 14:28:28 -08:00
Brian Behlendorf 404fd8578f Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons 2009-02-18 14:28:27 -08:00
Brian Behlendorf a6fe6c5a73 Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch 2009-02-18 14:28:24 -08:00
Brian Behlendorf d190a5b9bd Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t 2009-02-18 14:28:23 -08:00
Brian Behlendorf 6fe19bd252 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
 2009-02-18 14:28:15 -08:00
Brian Behlendorf 3ac1fca8dc Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap 2009-02-18 14:27:31 -08:00
Brian Behlendorf f0a8aedfbc Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 
Conflicts:

	lib/libzpool/kernel.c
	module/zfs/arc.c
 2009-02-18 14:27:12 -08:00
Brian Behlendorf 9d88c314ef Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-02-18 14:04:10 -08:00
Brian Behlendorf eb387a3281 Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch 2009-02-18 14:04:09 -08:00
Brian Behlendorf 3eb7fa9afd Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow 2009-02-18 14:04:08 -08:00
Brian Behlendorf c694a929cf Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-02-18 14:04:05 -08:00
Brian Behlendorf 32d4d74b04 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2009-02-18 14:04:04 -08:00
Brian Behlendorf 6fa66816c1 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/arc.c
 2009-02-18 14:03:55 -08:00
Brian Behlendorf 5be9e325a1 Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 
Conflicts:

	module/zfs/arc.c
 2009-02-18 14:03:22 -08:00
Brian Behlendorf 9a160959b6 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-02-18 13:12:59 -08:00
Brian Behlendorf ba528721da Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-02-18 13:12:58 -08:00
Brian Behlendorf b0c6d9452e Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-02-18 13:12:55 -08:00
Brian Behlendorf 0b8e48b813 Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-02-18 13:12:53 -08:00
Brian Behlendorf f499f3e5f4 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-02-18 13:12:49 -08:00
Brian Behlendorf fc8954db24 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2009-02-18 13:12:48 -08:00
Brian Behlendorf 6d44b6b1da Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-02-18 13:12:45 -08:00
Brian Behlendorf 345705bdd4 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-02-18 13:12:44 -08:00
Brian Behlendorf f97b1ae20f Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-02-18 13:12:41 -08:00
Brian Behlendorf e7722c9f51 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-02-18 13:12:40 -08:00
Brian Behlendorf f19f346366 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-02-18 13:12:36 -08:00
Brian Behlendorf e203e7b48f Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-02-18 13:12:35 -08:00
Brian Behlendorf f686a87058 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 
Conflicts:

	module/zfs/arc.c
 2009-02-18 13:12:26 -08:00
Brian Behlendorf 3b17164f71 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 
Conflicts:

	module/zfs/vdev.c
	module/zfs/zio.c
 2009-02-18 13:09:32 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 6cb1ac2d49 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-13 12:19:24 -08:00
Brian Behlendorf 68346c54fe Misnamed --load option sff changed to ssf 2009-02-13 12:07:34 -08:00
Brian Behlendorf e47c3be7df Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-02-07 13:12:09 -08:00
Brian Behlendorf 4e4327a0a5 Drop the KERNEL portion of this check, just checking __i386 is correct 2009-02-07 13:10:16 -08:00
Brian Behlendorf b39cecb7eb Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-06 15:30:38 -08:00
Brian Behlendorf 9b649b23ef Minor update to ensure heads make it in to the log 2009-02-06 15:28:49 -08:00
Brian Behlendorf 9bec57ce0f Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-02-06 15:10:41 -08:00