33f838af2c
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2009-12-11 16:21:59 -08:00
bab921dcf5
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2009-12-11 16:21:58 -08:00
4b45de3fc3
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2009-12-11 16:21:58 -08:00
ff8dc83d83
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2009-12-11 16:21:56 -08:00
4d80df7778
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2009-12-11 16:21:56 -08:00
15727a4121
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2009-12-11 16:21:55 -08:00
6917df0d96
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2009-12-11 16:21:55 -08:00
6f7c834700
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2009-12-11 16:21:54 -08:00
8e94f4be0b
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2009-12-11 16:21:53 -08:00
e988db2c3a
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-12-11 16:21:49 -08:00
b7ec7d57cc
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-12-11 16:21:49 -08:00
20d569a026
Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch
2009-12-11 16:21:48 -08:00
f470b86b7e
Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source
2009-12-11 16:21:47 -08:00
c1c287886d
Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch
2009-12-11 16:21:45 -08:00
936a375a96
Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces
2009-12-11 16:21:44 -08:00
284dc775b5
Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas
2009-12-11 16:21:42 -08:00
40280f8382
Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch
2009-12-11 16:21:42 -08:00
23fb247f72
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 16:21:39 -08:00
56c5217b86
Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants
2009-12-11 16:21:38 -08:00
dd8f466c30
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
2009-12-11 16:21:37 -08:00
373284ec9a
Merge commit 'refs/top-bases/gcc-shadow' into gcc-shadow
2009-12-11 16:21:36 -08:00
d3848c237b
Merge branch 'gcc-unused' into refs/top-bases/gcc-branch
2009-12-11 16:21:34 -08:00
9ccb6595b6
Merge commit 'refs/top-bases/gcc-unused' into gcc-unused
2009-12-11 16:21:33 -08:00
9ca8de8fce
Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
2009-12-11 16:21:31 -08:00
98dedd03e4
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
2009-12-11 16:21:30 -08:00
b1ebd5aefa
Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch
2009-12-11 16:21:28 -08:00
31b47d8d8d
Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis
2009-12-11 16:21:27 -08:00
0fbd8729d4
Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch
2009-12-11 16:21:25 -08:00
e0f0c48f31
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
2009-12-11 16:21:24 -08:00
ec39f81246
Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch
2009-12-11 16:21:22 -08:00
a83be96d1e
Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype
2009-12-11 16:21:21 -08:00
e4c253b3e3
Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch
2009-12-11 16:21:19 -08:00
2a5101737e
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
2009-12-11 16:21:18 -08:00
404d3c8509
Merge branch 'gcc-debug' into refs/top-bases/gcc-branch
2009-12-11 16:21:16 -08:00
6be4f70345
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
2009-12-11 16:21:15 -08:00
9f1c6b0416
Merge branch 'gcc-cast' into refs/top-bases/gcc-branch
2009-12-11 16:21:13 -08:00
912a3fa030
Merge commit 'refs/top-bases/gcc-cast' into gcc-cast
2009-12-11 16:21:12 -08:00
69dcaf00f3
Merge branch 'gcc-c90' into refs/top-bases/gcc-branch
2009-12-11 16:21:11 -08:00
ac0fb4a24e
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
2009-12-11 16:21:10 -08:00
058ac9ba78
Pull in latest man pages as part of update-zfs.sh
...
The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages. These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS. Howver, they should be pretty
minor I've tried hard to keep the interface the same.
In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.
2009-12-11 16:15:33 -08:00
202884ef48
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-12-11 12:07:46 -08:00
acd798cfd4
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2009-12-11 12:07:23 -08:00
f8d093f69b
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
2009-12-11 12:07:23 -08:00
0cc4cdb30d
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
2009-12-11 12:07:22 -08:00
b76d12a644
Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch
2009-12-11 12:07:22 -08:00
ba7ccf8ccd
Cast to unsigned long long for 32-bit arches
2009-12-11 11:41:04 -08:00
80a4449d7e
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 15:51:30 -08:00
0ec3a0ef62
Add udev rules to zfs-test package
2009-11-24 15:48:16 -08:00
8c87d8b629
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-11-24 14:59:12 -08:00
07a35df315
The libuuid and libblkid have been split from e2fsprogs in fc12,
...
el6, and ch5 systems. Additionally, correct ZFS filesystem detection
has not yet been added to these packages so for now disable blkid.
2009-11-24 14:54:33 -08:00
Brian Behlendorf